Merge branch 'CI_CA_BottomIssue' into Develop

Amrita Vishnoi
2 parents 3a0ef8d5 4cbb62b0
Showing 2 changed files with 28 additions and 2 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.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');
+                          }
+
                       }
@@ -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);
+                          }
                       }