ADAM / AIAHTML5

Commit 093fbc3f3f5216cb8dce2a4cddd88cee6301c71e

Authored by Nikita Kulshreshtha
2 parents b58bbfbf bca264e9

Merge branch 'CI_CA_jsPanelBackground_Issue' into Develop

Inline Side-by-side
Showing 2 changed files with 6 additions and 9 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
  View file @093fbc3
... ... @@ -552,7 +552,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
552 552 ' kind="captions" srclang="en" label="On"><object width="640" height="360"' +
553 553 ' type="application/x-shockwave-flash" data="//vjs.zencdn.net/3.2/video-js.swf"><param name="allowfullscreen" value="true">' +
554 554 ' <param name="allowscriptaccess" value="always"><param name="movie" value="//vjs.zencdn.net/3.2/video-js.swf">' +
555   - ' <param name="flashvars" ng-value="controls=true&amp;file=' + $scope.clickedCAVideo + '"><img ng-src="content/images/common/player/frameaccuracy_logo.jpg" style="height:80%;" alt="Here we are" title="No video playback capabilities"></object></video><div class="col-sm-12 well"><div id="sid" align="left" style="height:40px;overflow-y:scroll !important"><p>' + $scope.clickedCASummary + '</p></div><button id="btnTxtOnOff" class="btn btn-primary pull-right">Text Off</button></div></div></div>',
  555 + ' <param name="flashvars" ng-value="controls=true&amp;file=' + $scope.clickedCAVideo + '"><img ng-src="content/images/common/player/frameaccuracy_logo.jpg" style="height:80%;" alt="Here we are" title="No video playback capabilities"></object></video><div class="col-sm-12 well video-subtitle"><div id="sid" align="left" style="height:40px;overflow-y:scroll !important"><p>' + $scope.clickedCASummary + '</p></div><button id="btnTxtOnOff" class="btn btn-primary pull-right">Text Off</button></div></div></div>',
556 556  
557 557 //ajax: {
558 558 // url: 'app/views/ca/ca-view-detail.html'
... ... @@ -581,12 +581,12 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
581 581 var videoHeight = $('#divplayerinlineVideo div').height();
582 582 if (videoHeight <= 0)
583 583 videoHeight = 360;
584   - var textH = $('.well').height();
  584 + var textH = $('.video-subtitle').height();
585 585 textH = textH + 40;
586 586 var blackBorderHeight = jspContentHeight - (videoHeight + textH);
587 587  
588 588 if ($('.jsPanel-content').length > 0) {
589   - $('.well').css('margin-bottom', blackBorderHeight);
  589 + $('.video-subtitle').css('margin-bottom', blackBorderHeight);
590 590 $('#divplayerinlineVideo').css('background', '#fff');
591 591 }
592 592  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
  View file @093fbc3
... ... @@ -583,7 +583,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
583 583 parentSlug: 'clinical-illustrations',
584 584 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>' +
585 585 '<div class="col-sm-12 img-thumbnail" align="center">' +
586   - '<img src="' + $scope.clickedCIImage + '" alt="" title="" class="img-responsive "><div class="col-sm-12 well">' +
  586 + '<img src="' + $scope.clickedCIImage + '" alt="" title="" class="img-responsive "><div class="col-sm-12 well img-subtitle">' +
587 587 '<div align="left" id="sid"><p>' + $scope.clickedCISummary + '</p></div><button id="btnTxtOnOff" class="btn btn-primary pull-right">Text Off</button>' +
588 588 '<script>$(document).ready(function(){$("#btnTxtOnOff").click(function(){$("#sid").toggle();if($.trim($(this).text()) === "Text Off"){$(this).text("Text On");}else{$(this).text("Text Off");}});});</script></div>' +
589 589 '</div></div>',
... ... @@ -612,14 +612,11 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
612 612 var imgHeight = $('.img-thumbnail').find('img').height();
613 613 if (imgHeight <= 0)
614 614 imgHeight = 320;
615   - var textH = $('.well').height();
  615 + var textH = $('.img-subtitle').height();
616 616 textH = textH + 40;
617 617 var blackBorderHeight = jspContentHeight - (imgHeight + textH);
618 618 if ($('.jsPanel-content').length > 0) {
619   - $('.jsPanel-btn-min').attr('style', 'display: none');
620   - $('.jsPanel-btn-max').attr('style', 'display: none');
621   - $('.jsPanel-btn-norm').attr('style', 'display: none');
622   - $('.well').css('margin-bottom', blackBorderHeight);
  619 + $('.img-subtitle').css('margin-bottom', blackBorderHeight);
623 620 }
624 621 }
625 622  
... ...