diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js index 1deca09..ee466e7 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js @@ -563,7 +563,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout left: 1, }, - size: { width: $(window).outerWidth() - 10, height: $(window).outerHeight() }, + size: { width: $(window).outerWidth() - 10, height: $(window).outerHeight() - 110 }, }); @@ -576,6 +576,20 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout "slug": $rootScope.currentSlug }); + + var jspContentHeight = $('.jsPanel-content').height(); + var videoHeight = $('#divplayerinlineVideo div').height(); + if (videoHeight <= 0) + videoHeight = 360; + var textH = $('.well').height(); + textH = textH + 40; + var blackBorderHeight = jspContentHeight - (videoHeight + textH); + + if ($('.jsPanel-content').length > 0) { + $('.well').css('margin-bottom', blackBorderHeight); + $('#divplayerinlineVideo').css('background', '#fff'); + } + } diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js index fc6c35c..9ea57b8 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js @@ -608,7 +608,19 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout "slug": $rootScope.currentSlug }); - + var jspContentHeight = $('.jsPanel-content').height(); + var imgHeight = $('.img-thumbnail').find('img').height(); + if (imgHeight <= 0) + imgHeight = 320; + var textH = $('.well').height(); + textH = textH + 40; + var blackBorderHeight = jspContentHeight - (imgHeight + textH); + if ($('.jsPanel-content').length > 0) { + $('.jsPanel-btn-min').attr('style', 'display: none'); + $('.jsPanel-btn-max').attr('style', 'display: none'); + $('.jsPanel-btn-norm').attr('style', 'display: none'); + $('.well').css('margin-bottom', blackBorderHeight); + } }