diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
index 7e5a105..377c634 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
@@ -804,8 +804,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
// open JS panel for curriculum with define cornonate in CB jason
$scope.jsPanelWidth = $scope.ciOpenInOtherModules.size.width;//1000;
$scope.jsPanelHeight = $scope.ciOpenInOtherModules.size.height;
- if ($scope.ciOpenInOtherModules.size.height > 500)
- $scope.jsPanelHeight = 500;
+ if ($scope.ciOpenInOtherModules.size.height > 540)
+ $scope.jsPanelHeight = 540;
$scope.jsPanelLeft = 320;
$scope.jsPanelTop = $rootScope.cBModulejsPanelTop();
@@ -856,10 +856,13 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
$("#" + $scope.jsPanelID + " .img-thumbnail").css("height", $("#" + $scope.jsPanelID + " .jsPanel-content").height());
- $('#CIView').css("height", $(window).outerHeight() - 65);
+ if (!$rootScope.isCallFromOtherModule) {
+ $('#CIView').css("height", $(window).outerHeight() - 65);
- $('#CIView').css("width", $(window).outerWidth() - 15);
-
+ $('#CIView').css("width", $(window).outerWidth() - 46);
+
+
+ }
if ($rootScope.isCallFromOtherModule) {
var canvasDIvHeight = parseInt($("#" + $scope.jsPanelID).outerHeight()) - 40;
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
index 9d19f39..6445b97 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
@@ -385,9 +385,14 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
$scope.ImagePanelclick();
var imfgEle = document.getElementById("imgtag");
if (imfgEle!=null)
- imfgEle.src = "data:image/png;base64," + $rootScope.windowsimageSource;
+ imfgEle.src = "data:image/png;base64," + $rootScope.windowsimageSource;
+ setTimeout(function () {
+ var cleintht=imfgEle.clientHeight;
+ if(cleintht>0)
+ $('.jsPanel-content').css('height', cleintht);
$scope.CBEnableUI();
+ }, 200)
}, 200)
}
diff --git a/400-SOURCECODE/AIAHTML5.Web/libs/jquery/jquery_plugin/jsPanel/jspanel/jquery.jspanel.js b/400-SOURCECODE/AIAHTML5.Web/libs/jquery/jquery_plugin/jsPanel/jspanel/jquery.jspanel.js
index 078a8ae..77d2030 100644
--- a/400-SOURCECODE/AIAHTML5.Web/libs/jquery/jquery_plugin/jsPanel/jspanel/jquery.jspanel.js
+++ b/400-SOURCECODE/AIAHTML5.Web/libs/jquery/jquery_plugin/jsPanel/jspanel/jquery.jspanel.js
@@ -856,10 +856,11 @@ var jsPanel = {
}
var pathname = window.location.pathname;
//birendra
+ var currentController = panel.option.currentController;
if (pathname == "/curriculum-builder-detail")
{
- var currentController = panel.option.currentController;
+
if (currentController == 'DAController') {
var len= (panel.option.id).split("_").length;
var MultiWinId = (panel.option.id).split("_")[len-1];
@@ -889,7 +890,7 @@ var jsPanel = {
panel.css({
top: parseInt(80),
left: parseInt(320),
- width: parseInt(1025),
+ width: currentController == 'CIController' ? 1010 : 1025,
height: currentController == 'CIController' ? 550 : 580,
});
@@ -898,7 +899,7 @@ var jsPanel = {
{
panel.css({
top: parseInt(70),//panel.option.maximizedMargin.top),
- left: parseInt(panel.option.maximizedMargin.left),
+ left:currentController == 'CIController' ? 15 : parseInt(panel.option.maximizedMargin.left),
width: parseInt(panel.parent().outerWidth(), 10) - parseInt(panel.option.maximizedMargin.left) - parseInt(panel.option.maximizedMargin.right),
height: parseInt(panel.parent().outerHeight()) - parseInt(panel.option.maximizedMargin.top) - parseInt(panel.option.maximizedMargin.bottom) - 65
});
@@ -1046,10 +1047,11 @@ var jsPanel = {
} else {
panelTop = panel.option.position.top;
}
- var pathname = window.location.pathname;
+ var pathname = window.location.pathname;
+ var currentController = panel.option.currentController;
if (pathname == "/curriculum-builder-detail")
{
- var currentController = panel.option.currentController;
+
if (currentController == 'DAController') {
var len= (panel.option.id).split("_").length;
var MultiWinId = (panel.option.id).split("_")[len-1];
@@ -1088,7 +1090,7 @@ var jsPanel = {
else
{
panel.css({
- width: panel.option.size.width,
+ width: currentController == 'CIController' ? panel.option.size.width-18 : panel.option.size.width,
height: parseInt(panel.option.size.height, 10) + 35,
top: panelTop,
left: panel.option.position.left