From 716861f24d02ef1a32abc0a322ed838753858077 Mon Sep 17 00:00:00 2001
From: Birendra <Birendra@BIRENDRA-PC>
Date: Mon, 22 Mar 2021 18:01:07 +0530
Subject: [PATCH] fix panel min,max issue

---
 400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js                            |  12 ++++++------
 400-SOURCECODE/AIAHTML5.Web/app/controllers/AIController.js                             |  26 +++++++++++++++-----------
 400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js                             |  13 +++++++------
 400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js                             |  23 +++++++++++------------
 400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js                      |   4 ++--
 400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js                             |  56 ++++++++++++++++++--------------------------------------
 400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js                           | 140 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------
 400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js                       |   9 +++++----
 400-SOURCECODE/AIAHTML5.Web/app/controllers/MyAnimationController.js                    |   7 ++++---
 400-SOURCECODE/AIAHTML5.Web/app/controllers/MyPictureController.js                      |  18 ++++++++++--------
 400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js                   |  31 ++++++++++++++-----------------
 400-SOURCECODE/AIAHTML5.Web/index.aspx                                                  |  10 +++++-----
 400-SOURCECODE/AIAHTML5.Web/libs/jquery/jquery_plugin/jsPanel/jspanel/jquery.jspanel.js | 114 ++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------
 13 files changed, 207 insertions(+), 256 deletions(-)

diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js
index 05f20a4..4eacf2c 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js
@@ -17,7 +17,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
                     'width': 0,
                     'height': 0,
                     'minimised': false,
-                    'maximised': false,
+                    'maximised': true,
                     'minmaxAutoEvent':true,
 
             };
@@ -356,9 +356,9 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
                           $scope.Set3DwindowStoreData(windowviewid, 'currentViewTitle', ThreeDTitle);
                           localStorage.setItem("currentViewTitle", ThreeDTitle);
 
-                          var isMaximize = $scope.ThreeDOpenInOtherModules.maximised;
-                          var isMinimize = $scope.ThreeDOpenInOtherModules.minimised;
-
+                          var isMaximize = $scope.ThreeDOpenInOtherModules.maximised!=undefined?$scope.ThreeDOpenInOtherModules.maximised:false;
+                          var isMinimize = $scope.ThreeDOpenInOtherModules.minimised!=undefined?$scope.ThreeDOpenInOtherModules.minimised:false;
+                         
                           $scope.Set3DwindowStoreData(windowviewid, 'maximised', isMaximize);
                           $scope.Set3DwindowStoreData(windowviewid, 'minimised', isMinimize);
                           if($location.url()== "/curriculum-builder-detail") {
@@ -421,7 +421,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
         }
         else {
             $scope.jsPanelWidth = $(window).outerWidth() - 20;
-            $scope.jsPanelHeight = $(window).outerHeight() - 105;
+            $scope.jsPanelHeight = $(window).outerHeight() - 90;
             $scope.jsPanelLeft = 1;
             $scope.jsPanelTop = 70;
         }
@@ -435,7 +435,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
                 theme: 'success',
                 currentController: '3dAController',
                 parentSlug: $scope.Get3DwindowStoreData(windowviewid, 'parentSlugName'),
-                content: '<div class="col-sm-12" style="height: 100%;overflow: scroll;" >' +
+                content: '<div style="height: 100%;overflow: scroll;" >' +
                         '<object data="' + Selected3DImagePath + '" width="100%" height="100%" type="image/svg+xml" id="threedImage_' + windowviewid + '" onload="AnimationOnLoad(event)"></object>' +
                         '</div><script>$(document).ready(function(){var $ua = navigator.userAgent; if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {var threeDivWidth = $("#ThreeDView").css("width");$("#ThreeDView").css({"left":"0px","width":"100%","min-idth": threeDivWidth}); var jspanelContainerWidth = $(".jsPanel-content").css("width"); $(".jsPanel-content").css({ "width": "100%", "min-width": jspanelContainerWidth}); $("#ThreeDImagePanel_' + windowviewid + '").css("width", "100%"); }});</script>',
                 title: tittle,
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/AIController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/AIController.js
index c7a8c5d..ca65a6b 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/AIController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/AIController.js
@@ -77,7 +77,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                     'width': 0,
                     'height': 0,
                     'minimised': false,
-                    'maximised': false,
+                    'maximised': true,
                     'minmaxAutoEvent':true,
                     'annotationData':{shapeStates:[],paintCanvasState:[]},
             };
@@ -1105,8 +1105,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                           $scope.SetAIwindowStoreData(windowviewid, 'currentViewTitle', aiTitle);
                           localStorage.setItem("currentViewTitle", aiTitle);
 
-                          var isMaximize = $scope.aiOpenInOtherModules.maximised;
-                          var isMinimize = $scope.aiOpenInOtherModules.minimised;
+                          var isMaximize = $scope.aiOpenInOtherModules.maximised!=undefined?$scope.aiOpenInOtherModules.maximised:false;
+                          var isMinimize = $scope.aiOpenInOtherModules.minimised!=undefined?$scope.aiOpenInOtherModules.minimised:false;
+                         
                           $scope.SetAIwindowStoreData(windowviewid, 'maximised', isMaximize);
                           $scope.SetAIwindowStoreData(windowviewid, 'minimised', isMinimize);
 
@@ -1168,9 +1169,10 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
         }
         else {
             $scope.jsPanelWidth = $(window).innerWidth() - 30;
-            $scope.jsPanelHeight = $(window).innerHeight() - 150;
+            $scope.jsPanelHeight =$(window).innerHeight() - 150;
             $scope.jsPanelLeft = 15;
             $scope.jsPanelTop = 70;
+           
         }
 
             if (selectedAIImage.length > 0) {
@@ -1217,6 +1219,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                          $scope.SetAIwindowStoreData(windowviewid, 'minimised',false);
                          var canvasDIvHeight = $('#aiImagePanel_' + windowviewid+ " .jsPanel-content").height();                    
                          $('#canvasDivAI_' + windowviewid).css('height', canvasDIvHeight-5);
+                       
                      },
                     onnormalized:function (panel) {
                         var isAutoCalled = $scope.GetAIwindowStoreData(windowviewid, 'minmaxAutoEvent');
@@ -1228,7 +1231,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                         $scope.SetAIwindowStoreData(windowviewid, 'maximised',false);
                         var canvasDIvHeight = $('#aiImagePanel_' + windowviewid+ " .jsPanel-content").height();                    
                         $('#canvasDivAI_' + windowviewid).css('height', canvasDIvHeight-5);
-                    },
+                    },                
                     resizable: {
                         stop: function (event, ui) {
                             var len = (event.currentTarget.id).split("_").length;
@@ -1276,10 +1279,11 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                 $('.jsPanel-content .jsPanel-theme-success').css('overflow-y', 'auto !important')
                 var canvasDIvHeight = $('#aiImagePanel_' + windowviewid+ " .jsPanel-content").height();
                 // console.log($rootScope.OpenAdamImages);
-                $('#AIView').css("height", $(window).innerHeight()-100);
-
-                $('#AIView').css("width",$(window).innerWidth()-100);
-                    
+                if (!$rootScope.isCallFromOtherModule) {
+                    $('#AIView').css("height", $(window).innerHeight()-100);
+                    $('#AIView').css("width",$(window).innerWidth()-100);
+                }
+                               
                 $('#canvasDivAI_' + windowviewid).css('height', canvasDIvHeight-5);             
               
                if (!$rootScope.isCallFromOtherModule) {
@@ -1376,8 +1380,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
         $rootScope.resetMenuOption();
 
         //remove pre event
-        $("#aiImagePanel_" + windowviewid).off("click");
-
+        // $("#aiImagePanel_" + windowviewid).off("click");
+       
         $("#aiImagePanel_" + windowviewid).on('click', function (event) {
              //after drawing annotation click not work on iPad/Android device
             var pnlName = event.currentTarget.id;
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
index dd5b8f8..997edc0 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
@@ -63,7 +63,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                     'width': 0,
                     'height': 0,
                     'minimised': false,
-                    'maximised': false,
+                    'maximised': true,
                     'minmaxAutoEvent':true,
             };
             return windata;
@@ -878,8 +878,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                           $scope.SetCAwindowStoreData(windowviewid, 'currentViewTitle', ciTitle);
                           localStorage.setItem("currentViewTitle", ciTitle);
 
-                          var isMaximize = $scope.caOpenInOtherModules.maximised;
-                          var isMinimize = $scope.caOpenInOtherModules.minimised;
+                          var isMaximize = $scope.caOpenInOtherModules.maximised!=undefined?$scope.caOpenInOtherModules.maximised:false;
+                          var isMinimize = $scope.caOpenInOtherModules.minimised!=undefined?$scope.caOpenInOtherModules.minimised:false;
+
                           $scope.SetCAwindowStoreData(windowviewid, 'maximised', isMaximize);
                           $scope.SetCAwindowStoreData(windowviewid, 'minimised', isMinimize);
 
@@ -940,7 +941,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
             if ($rootScope.isCallFromOtherModule) {
                  if($rootScope.linkToOpenCa==true)
                  {
-                    $scope.jsPanelWidth = $(window).outerWidth() - 20;
+                    $scope.jsPanelWidth = $(window).outerWidth() - 10;
                     $scope.jsPanelHeight = $(window).outerHeight() - 105;
                     $scope.jsPanelLeft = 1;
                     $scope.jsPanelTop = 70;
@@ -972,7 +973,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                
             }
             else {
-                $scope.jsPanelWidth = $(window).outerWidth() - 20;
+                $scope.jsPanelWidth = $(window).outerWidth()-30;
                 $scope.jsPanelHeight = $(window).outerHeight() - 105;
                 $scope.jsPanelLeft = 1;
                 $scope.jsPanelTop = 70;
@@ -1163,7 +1164,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
         $rootScope.resetMenuOption();
         // call from while open module in CB
         //remove pre event
-         $("#caImagePanel_" + windowviewid).off("click");
+        // $("#caImagePanel_" + windowviewid).off("click");
 
         $("#caImagePanel_" + windowviewid).on('click', function (event) {
              //after drawing annotation click not work on iPad/Android device
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
index 4f182d8..9cbe59b 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
@@ -73,7 +73,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                     'width': 0,
                     'height': 0,
                     'minimised': false,
-                    'maximised': false,
+                    'maximised': true,
                     'minmaxAutoEvent':true,
                     'annotationData':{shapeStates:[],paintCanvasState:[]},
 
@@ -891,9 +891,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                           var ciTitle = $scope.ciOpenInOtherModules.anatomyTitle;
                           $scope.SetCIwindowStoreData(windowviewid, 'currentViewTitle', ciTitle);
                           localStorage.setItem("currentViewTitle", ciTitle);
+                          var isMaximize = $scope.ciOpenInOtherModules.maximised!=undefined?$scope.ciOpenInOtherModules.maximised:false;
+                          var isMinimize = $scope.ciOpenInOtherModules.minimised!=undefined?$scope.ciOpenInOtherModules.minimised:false;
 
-                          var isMaximize = $scope.ciOpenInOtherModules.maximised;
-                          var isMinimize = $scope.ciOpenInOtherModules.minimised;
                           $scope.SetCIwindowStoreData(windowviewid, 'maximised', isMaximize);
                           $scope.SetCIwindowStoreData(windowviewid, 'minimised', isMinimize);
 
@@ -956,8 +956,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
 
             }
             else {
-                $scope.jsPanelWidth = $(window).outerWidth() - 15;
-                $scope.jsPanelHeight = $(window).outerHeight() - 140;
+                $scope.jsPanelWidth = $(window).outerWidth() - 30;
+                $scope.jsPanelHeight = $(window).outerHeight() - 150;
                 $scope.jsPanelLeft = 15;
                 $scope.jsPanelTop = 70;
             }
@@ -971,12 +971,12 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                 content:'<div>'+
                 ' <div class="container-fluid">'+
                 ' <div class="row">'+
-                '<div class="img-thumbnail" style="overflow: hidden;width:100%;position:relative" id="canvasDivCI_' + windowviewid + '"> <canvas id="canvasPaintCI_' + windowviewid + '" ng-click="FreeStylePaint($event)"  width="2270" height="700" class="canvas-annotationStyle1" style="position: absolute;z-index:0;left:0px"></canvas><canvas id="canvasCI_' + windowviewid + '" ng-click="onDrawingCanvasClick($event)" width="2270" height="700" class="canvas-annotationStyle" style="position: absolute; background-color: transparent;z-index:1;left:0px "></canvas>' +
+                '<div class="img-thumbnail" style="overflow: scroll;width:100%;position:relative" id="canvasDivCI_' + windowviewid + '"> <canvas id="canvasPaintCI_' + windowviewid + '" ng-click="FreeStylePaint($event)"  width="2270" height="700" class="canvas-annotationStyle1" style="position: absolute;z-index:0;left:0px"></canvas><canvas id="canvasCI_' + windowviewid + '" ng-click="onDrawingCanvasClick($event)" width="2270" height="700" class="canvas-annotationStyle" style="position: absolute; background-color: transparent;z-index:1;left:0px "></canvas>' +
                 //'<div class="col-sm-12 img-thumbnail" align="center">' +
                 '<img id="ciimage_' + windowviewid + '" alt="" title="" style="left:0px;top:0px;position:absolute;visibility:hidden">' +
                 '<div id="summary_' + windowviewid + '" class="col-sm-12 well img-subtitle" style="position:absolute;bottom:0px;margin-bottom:0px;padding:5px;width:100%">' +
                 '<div id="sid_' + windowviewid + '" align="left" style="height:100px;overflow-y:scroll !important;-webkit-overflow-scrolling:touch !important;"><p>' + selectedImageCISummary + '</p></div><button id="btnTxtOnOff_' + windowviewid + '" class="btn btn-primary pull-right">Text Off</button>' +
-                '<script>$(document).ready(function(){  var $ua = navigator.userAgent;if(($ua.match(/(iPod|iPhone|iPad|android)/i))) { var jspanelContainerWidth = $(".jsPanel-content").css("width"); $(".jsPanel-content").css({ "width": "100%", "min-width": jspanelContainerWidth });$("#' + $scope.jsPanelID + '").css("width", "100%"); }$("#btnTxtOnOff_' + windowviewid + '").click(function(){if($.trim($(this).text()) === "Text Off"){$(this).text("Text On");$("#sid_' + windowviewid + '").css("visibility","hidden");}else{$(this).text("Text Off");$("#sid_' + windowviewid + '").css("visibility","visible");} GetTextVisibityCI(event);});});</script></div>' +
+                '<script>$(document).ready(function(){  var $ua = navigator.userAgent;if(($ua.match(/(iPod|iPhone|iPad|android)/i))) { $(".jsPanel-content").css({ "width": "100%"});$("#' + $scope.jsPanelID + '").css("width", "100%"); }$("#btnTxtOnOff_' + windowviewid + '").click(function(){if($.trim($(this).text()) === "Text Off"){$(this).text("Text On");$("#sid_' + windowviewid + '").css("visibility","hidden");}else{$(this).text("Text Off");$("#sid_' + windowviewid + '").css("visibility","visible");} GetTextVisibityCI(event);});});</script></div>' +
                 '</div>'+
                 '</div></div></div>',
                 title: tittle,
@@ -1075,12 +1075,11 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
 
 
             $scope.SetCIwindowStoreData(windowviewid, 'currentSlug', 'clinical-illustrations-detail');
-            $timeout(function () {
-
+            $timeout(function () {              
                 var canvasDIvHeight = $('#ciImagePanel_' + windowviewid+ " .jsPanel-content").height();
-    
+               
                 $('#canvasDivCI_' + windowviewid).css('height', canvasDIvHeight);
-              
+               
                 if (!$rootScope.isCallFromOtherModule) {
                     $('#CIView').css("height", $(window).outerHeight() - 65);   
                     $('#CIView').css("width", $(window).outerWidth() - 15); 
@@ -1212,7 +1211,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
         //call when module loaded 
         $rootScope.resetMenuOption();
          //remove pre event
-         $("#ciImagePanel_" + windowviewid).off("click");
+         //$("#ciImagePanel_" + windowviewid).off("click");
 
          $("#ciImagePanel_" + windowviewid).on('click', function (event) {
              //after drawing annotation click not work on iPad/Android device
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
index 2f71c34..1aed23f 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
@@ -37,8 +37,8 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
             }
             else
             {
-             $("#treecontent").css('height',screen.height-250);
-             $("#cbdivarea").css('height',screen.height-180);
+             $("#treecontent").css('height',screen.height-280);
+             $("#cbdivarea").css('height',screen.height-210);
             }
  
         $('#sidebar-wrapper').unbind('click');
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index a43b91b..07f6214 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -132,7 +132,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
                         'width': 0,
                         'height': 0,
                         'minimised': false,
-                        'maximised': false,
+                        'maximised': true,
                         'minmaxAutoEvent':true,
                         'id': 0,
                         'moduleName': 'DISSECTIBLE_ANATOMY',
@@ -754,8 +754,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
                     //// one layer down as compare to current running on production
                     $scope.SetwindowStoreData(windowviewid, 'layerNumber', $scope.daOpenInOtherModules.layerNumber - 1);
 
-                    var isMaximize = $scope.daOpenInOtherModules.maximised;
-                    var isMinimize = $scope.daOpenInOtherModules.minimised;
+                    var isMaximize = $scope.daOpenInOtherModules.maximised!=undefined?$scope.daOpenInOtherModules.maximised:false;
+                    var isMinimize = $scope.daOpenInOtherModules.minimised!=undefined?$scope.daOpenInOtherModules.minimised:false;
+
                     $scope.SetwindowStoreData(windowviewid, 'maximised', isMaximize);
                     $scope.SetwindowStoreData(windowviewid, 'minimised', isMinimize);
                     $scope.SetwindowStoreData(windowviewid, 'moduleName', "DISSECTIBLE_ANATOMY");
@@ -984,13 +985,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
                             }
                              $scope.SetwindowStoreData(windowviewid, 'maximised',true);
                              $scope.SetwindowStoreData(windowviewid, 'minimised',false);
-                             if ($rootScope.isCallFromOtherModule) {
-                                var canvasDIvHeight = $('#daImagePanel_' + windowviewid+ " .jsPanel-content").height()-95; 
-                            }
-                            else
-                            {
-                                var canvasDIvHeight = $('#daImagePanel_' + windowviewid+ " .jsPanel-content").height()-50;   
-                            }
+                             var canvasDIvHeight = $('#daImagePanel_' + windowviewid+ " .jsPanel-content").height()-50;
+                           
                             $('#canvasDivDA_' + windowviewid).css('height', canvasDIvHeight);
                          },
                         onnormalized:function (panel) {
@@ -1001,14 +997,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
                             }
                             $scope.SetwindowStoreData(windowviewid, 'minimised',false);
                             $scope.SetwindowStoreData(windowviewid, 'maximised',false);
-                            if ($rootScope.isCallFromOtherModule) {
-                                var canvasDIvHeight = $('#daImagePanel_' + windowviewid+ " .jsPanel-content").height()-95; 
-                            }
-                            else
-                            {
-                                var canvasDIvHeight = $('#daImagePanel_' + windowviewid+ " .jsPanel-content").height()-60;                           
-                                   
-                            }
+                            var canvasDIvHeight = $('#daImagePanel_' + windowviewid+ " .jsPanel-content").height()-50;
+                
                             $('#canvasDivDA_' + windowviewid).css('height', canvasDIvHeight);
                         },
                         resizable: {
@@ -1017,14 +1007,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
                                 var windowviewid = (event.currentTarget.id).split("_")[len - 1];
                                 $scope.SetwindowStoreData(windowviewid, 'width', ui.size.width);
                                 $scope.SetwindowStoreData(windowviewid, 'height', ui.size.height);
-                                $rootScope.UnsaveCurriculum = true;                            
-                                if ($rootScope.isCallFromOtherModule) {
-                                    var canvasDIvHeight = $('#daImagePanel_' + windowviewid+ " .jsPanel-content").height()-95; 
-                                }
-                                else
-                                {
-                                    var canvasDIvHeight = $('#daImagePanel_' + windowviewid+ " .jsPanel-content").height()-50;   
-                                }
+                                $rootScope.UnsaveCurriculum = true;      
+                                var canvasDIvHeight = $('#daImagePanel_' + windowviewid+ " .jsPanel-content").height()-50;                      
+                                
                                 $('#canvasDivDA_' + windowviewid).css('height', canvasDIvHeight);
                             }
                             
@@ -1197,10 +1182,11 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
         $scope.loadDAView = function (currentBodyViewId, windowviewid) {
 
             //0.4 added some stylesheets
-            $('#daBodyview').css("height", (parseInt($(window).outerHeight()) - 62 - 20));
-
-            $('#daBodyview').css("width", $(window).outerWidth());
-
+            if (!$rootScope.isCallFromOtherModule) {
+                $('#daBodyview').css("height", (parseInt($(window).outerHeight()) - 82));
+                $('#daBodyview').css("width", $(window).outerWidth());
+            }
+           
             $scope.SetwindowStoreData(windowviewid,'voId',currentBodyViewId);
             //1. load navigator man first
             console.log('before LoadBodyViewNavigatorImage call')
@@ -1254,7 +1240,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
            $rootScope.resetMenuOption();
 
            //remove pre event
-            $("#daImagePanel_" + windowviewid).off("click");
+           // $("#daImagePanel_" + windowviewid).off("click");
 
             $("#daImagePanel_" + windowviewid).on('click', function (event) {
                 
@@ -2113,13 +2099,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
             $scope.SetwindowStoreData(windowviewid,'BodyRegionCordinatesData',[]);
             $('#daBodyview').css('width', '100%');
 
-            if ($rootScope.isCallFromOtherModule) {
-                var canvasDIvHeight = $('#daImagePanel_' + windowviewid+ " .jsPanel-content").height()-95; 
-            }
-            else
-            {
-                var canvasDIvHeight = $('#daImagePanel_' + windowviewid+ " .jsPanel-content").height()-45;   
-            }
+            var canvasDIvHeight = $('#daImagePanel_' + windowviewid+ " .jsPanel-content").height()-50; 
                                      
             $('#canvasDivDA_' + windowviewid).css('height', canvasDIvHeight);
             $('#leftToolBarDA_' + windowviewid).css('height', $('#daImagePanel_' + windowviewid).outerHeight())
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index c8599fc..7bea324 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -9050,18 +9050,26 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
 
     }
 
+    $rootScope.CloseExportModal = function () {
+        
+        $(".modal-backdrop").css("opacity", "0");
+        $(".modal-backdrop").css("z-index", "0");
+        $("#exportfilename").val("");
+        $("#filename_open").val("");
+        $(".export-image").modal("hide");
+        $(".export-image-ipad").modal("hide");
+    }
 
     $rootScope.SaveImagefile = function () {
         // select one module from multiple
         var PanelElement=  $scope.GetPanelElement($rootScope.panelNameWithCb);
-
         var canvasDiv = PanelElement.canvasDivElement;
         if (canvasDiv == null || canvasDiv == undefined) return;
         var canvasDivId = canvasDiv.id;
+        var fileName =  $("#exportfilename").val() + '.jpg';
         $("#" + canvasDivId).append("<img id='exportlogo' class='img-responsive'  src='content/images/adam-logo-small.png'/>");
         html2canvas($("#" + canvasDivId), {
-            onrendered: function (canvas) {
-                var fileName = document.getElementById("filename").value + '.jpg';
+            onrendered: function (canvas) {             
                 if (typeof (fileName) == "undefined" || fileName == ".jpg")
                     fileName = "Untitled.jpg"
 
@@ -9075,7 +9083,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
                         console.log(blob);
                         saveAs(blob, fileName);
                         $("#exportlogo").remove();
-                        $("#filename").val("");
+                        $("#exportfilename").val("");
 
                         var imageInfo=$rootScope.UserImageExportData[0];
 
@@ -9083,70 +9091,70 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
                         .then(
                         function (result) {
 
-                            if ($rootScope.DaWindowData != undefined && $rootScope.DaWindowData.length > 0) {
-                                for (var i = 0; i < $rootScope.DaWindowData.length; i++) {
-                                    $scope.updatedWindowListForSaveCB={
+                            // if ($rootScope.DaWindowData != undefined && $rootScope.DaWindowData.length > 0) {
+                            //     for (var i = 0; i < $rootScope.DaWindowData.length; i++) {
+                            //         $scope.updatedWindowListForSaveCB={
                     
-                                       // bodySystemTermList: $rootScope.DaWindowData[i].BodySystemData,
-                                        isTitleBarVisible: false, 
-                                        highlightOptionsSelectedId: 0,
-                                        selectedStructureID: 0,//N
-                                        contentDescriptorId: 0,
-                                        callOuts: $rootScope.DaWindowData[i].CurriculumTermData,                    
-
-                                        layerNumber: parseInt($rootScope.DaWindowData[i].layerNumber) + 1,
-                                        isModestyOn: $rootScope.DaWindowData[i].ModestyValue,
+                            //            // bodySystemTermList: $rootScope.DaWindowData[i].BodySystemData,
+                            //             isTitleBarVisible: false, 
+                            //             highlightOptionsSelectedId: 0,
+                            //             selectedStructureID: 0,//N
+                            //             contentDescriptorId: 0,
+                            //             callOuts: $rootScope.DaWindowData[i].CurriculumTermData,                    
+
+                            //             layerNumber: parseInt($rootScope.DaWindowData[i].layerNumber) + 1,
+                            //             isModestyOn: $rootScope.DaWindowData[i].ModestyValue,
                                         
-                                        isTopToolBarVisible: false, 
-                                        clickedTermList: $rootScope.DaWindowData[i].fullTermlist,
-                                        minimised: $rootScope.DaWindowData[i].minimised,
-                                        windowTitle: $rootScope.DaWindowData[i].currentViewTitle,
+                            //             isTopToolBarVisible: false, 
+                            //             clickedTermList: $rootScope.DaWindowData[i].fullTermlist,
+                            //             minimised: $rootScope.DaWindowData[i].minimised,
+                            //             windowTitle: $rootScope.DaWindowData[i].currentViewTitle,
                                         
-                                        maximised: $rootScope.DaWindowData[i].maximised,
-                                        size: {
-                                            width: $rootScope.DaWindowData[i].width,
-                                            height: $rootScope.DaWindowData[i].height
-                                        },
-                                        id: $rootScope.DaWindowData[i].voId,                   
+                            //             maximised: $rootScope.DaWindowData[i].maximised,
+                            //             size: {
+                            //                 width: $rootScope.DaWindowData[i].width,
+                            //                 height: $rootScope.DaWindowData[i].height
+                            //             },
+                            //             id: $rootScope.DaWindowData[i].voId,                   
                                       
-                                        imageId: $rootScope.DaWindowData[i].imageId,
-                                        position: {
-                                            top: $rootScope.DaWindowData[i].top,
-                                            left: $rootScope.DaWindowData[i].left,
-                                        },
-                                        mType: $rootScope.DaWindowData[i].moduleName,
-                                        containsCapturedContent: true,
+                            //             imageId: $rootScope.DaWindowData[i].imageId,
+                            //             position: {
+                            //                 top: $rootScope.DaWindowData[i].top,
+                            //                 left: $rootScope.DaWindowData[i].left,
+                            //             },
+                            //             mType: $rootScope.DaWindowData[i].moduleName,
+                            //             containsCapturedContent: true,
                                                           
-                                        zoom: $rootScope.DaWindowData[i].zoomInOut,
-                                        skinId: $rootScope.DaWindowData[i].curentEthnicity,
-                                        isResizeLock: false , //N
-                                        mode: $rootScope.DaWindowData[i].mode,
-                                        windowListId: 0,//N
-                                        canvasVScrollX: $rootScope.DaWindowData[i].CanvasDivTopPosition,
-                                        canvasHScrollX: $rootScope.DaWindowData[i].CanvasDivLeftPosition,                  
-                                        isCallOutVisible: false, 
-                                        annotationData:$rootScope.DaWindowData[i].annotationData,                  
-                                        isLeftToolBarVisible: false,
-                                        isModuleLoaded: false,                 
-                                        searchSelectedText: $rootScope.DaWindowData[i].searchSelectedText,
-                                        prevId: $rootScope.DaWindowData[i].prevId, 
+                            //             zoom: $rootScope.DaWindowData[i].zoomInOut,
+                            //             skinId: $rootScope.DaWindowData[i].curentEthnicity,
+                            //             isResizeLock: false , //N
+                            //             mode: $rootScope.DaWindowData[i].mode,
+                            //             windowListId: 0,//N
+                            //             canvasVScrollX: $rootScope.DaWindowData[i].CanvasDivTopPosition,
+                            //             canvasHScrollX: $rootScope.DaWindowData[i].CanvasDivLeftPosition,                  
+                            //             isCallOutVisible: false, 
+                            //             annotationData:$rootScope.DaWindowData[i].annotationData,                  
+                            //             isLeftToolBarVisible: false,
+                            //             isModuleLoaded: false,                 
+                            //             searchSelectedText: $rootScope.DaWindowData[i].searchSelectedText,
+                            //             prevId: $rootScope.DaWindowData[i].prevId, 
                     
-                                        isTransparent: $rootScope.DaWindowData[i].isTransparent,
-                                        transparencyBounds: $rootScope.DaWindowData[i].transparencyBounds,
-                                        transparencyValue: $rootScope.DaWindowData[i].transNumber,
-                                        layerNumberTransparency: $rootScope.DaWindowData[i].layerNumberTransparency,
-                                        transparencyX: $rootScope.DaWindowData[i].transparencyX,
-                                        transparencyY: $rootScope.DaWindowData[i].transparencyY,
-                                        layerNumberBeforeTBDraw: $rootScope.DaWindowData[i].layerNumberBeforeTBDraw,
-                                        showHideAnnotations: $rootScope.DaWindowData[i].showHideAnnotations
+                            //             isTransparent: $rootScope.DaWindowData[i].isTransparent,
+                            //             transparencyBounds: $rootScope.DaWindowData[i].transparencyBounds,
+                            //             transparencyValue: $rootScope.DaWindowData[i].transNumber,
+                            //             layerNumberTransparency: $rootScope.DaWindowData[i].layerNumberTransparency,
+                            //             transparencyX: $rootScope.DaWindowData[i].transparencyX,
+                            //             transparencyY: $rootScope.DaWindowData[i].transparencyY,
+                            //             layerNumberBeforeTBDraw: $rootScope.DaWindowData[i].layerNumberBeforeTBDraw,
+                            //             showHideAnnotations: $rootScope.DaWindowData[i].showHideAnnotations
                     
                     
-                                    }
-                                }
+                            //         }
+                            //     }
                                 
-                            }
+                            // }
 
-                            localStorage.setItem("daDataObject",JSON.stringify($scope.updatedWindowListForSaveCB) );
+                            //localStorage.setItem("daDataObject",JSON.stringify($scope.updatedWindowListForSaveCB) );
                             if(result!=null && result!="ADMIN" )
                             {
                                 var userid= $rootScope.userData.Id;
@@ -9173,21 +9181,23 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
 
             }
         });
-        $(".export-image").css("display", "none");
+        $(".modal-backdrop").css("opacity", "0");
+        $(".modal-backdrop").css("z-index", "0");
+        $(".export-image").modal("hide")      
 
     };
     
     $rootScope.SaveOpenImagefile = function () {
         // select one module from multiple
         var PanelElement=  $scope.GetPanelElement($rootScope.panelNameWithCb);
-
+        var fileName =  $("#filename_open").val() + '.jpg';
         var canvasDiv = PanelElement.canvasDivElement;
         if (canvasDiv == null || canvasDiv == undefined) return;
         var canvasDivId = canvasDiv.id;
         $("#" + canvasDivId).append("<img id='exportlogo' class='img-responsive'  src='content/images/adam-logo-small.png'/>");
         html2canvas($("#" + canvasDivId), {
             onrendered: function (canvas) {
-                var fileName = document.getElementById("filename_open").value + '.jpg';
+               
                 if (typeof (fileName) == "undefined" || fileName == ".jpg")
                     fileName = "Untitled.jpg"
 
@@ -9216,7 +9226,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
                         .then(
                         function (result) {
 
-                            localStorage.setItem("daDataObject",JSON.stringify($scope.updatedWindowListForSaveCB) );
+                            //localStorage.setItem("daDataObject",JSON.stringify($scope.updatedWindowListForSaveCB) );
                             if(result!=null && result!="ADMIN" )
                             {
                                 var userid= $rootScope.userData.Id;
@@ -9243,8 +9253,10 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
 
             }
         });
-        $(".export-image-ipad").css("display", "none");
-
+        $(".modal-backdrop").css("opacity", "0");
+        $(".modal-backdrop").css("z-index", "0");
+        $(".export-image-ipad").modal("hide");
+       
     };
 
 }]
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
index 7c39c6f..0f0e0a2 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
@@ -40,7 +40,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
                     'width': 0,
                     'height': 0,
                     'minimised': false,
-                    'maximised': false,
+                    'maximised': true,
                     'minmaxAutoEvent':true,
                     'isLabExChanged':false
 
@@ -311,8 +311,9 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
             var keywords = $scope.leOpenInOtherModules.id;
 
             $scope.SetLEwindowStoreData(windowviewid, 'keywords', keywords);
-            var isMaximize = $scope.leOpenInOtherModules.maximised;
-            var isMinimize = $scope.leOpenInOtherModules.minimised;
+            var isMaximize = $scope.leOpenInOtherModules.maximised!=undefined?$scope.leOpenInOtherModules.maximised:false;
+            var isMinimize = $scope.leOpenInOtherModules.minimised!=undefined?$scope.leOpenInOtherModules.minimised:false;
+ ;
             $scope.SetLEwindowStoreData(windowviewid, 'maximised', isMaximize);
             $scope.SetLEwindowStoreData(windowviewid, 'minimised', isMinimize);
 
@@ -537,7 +538,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
         $rootScope.resetMenuOption();
         
         //remove pre event
-        $("#labImagePanel_" + windowviewid).off("click");
+       // $("#labImagePanel_" + windowviewid).off("click");
 
         $("#labImagePanel_" + windowviewid).on('click', function (event) {
              var pnlName = event.currentTarget.id;
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/MyAnimationController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/MyAnimationController.js
index 77296c3..1c072de 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/MyAnimationController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/MyAnimationController.js
@@ -213,8 +213,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
         var aiTitle = $scope.VidOpenInOtherModules.anatomyTitle;
         $scope.SetVideowindowStoreData(windowviewid, 'currentViewTitle', aiTitle);
         localStorage.setItem("currentViewTitle", aiTitle);
-        var isMaximize = $scope.VidOpenInOtherModules.maximised;
-        var isMinimize = $scope.VidOpenInOtherModules.minimised;
+        var isMaximize = $scope.VidOpenInOtherModules.maximised!=undefined?$scope.VidOpenInOtherModules.maximised:false;
+        var isMinimize = $scope.VidOpenInOtherModules.minimised!=undefined?$scope.VidOpenInOtherModules.minimised:false;
+ 
         $scope.SetVideowindowStoreData(windowviewid, 'maximised', isMaximize);
         $scope.SetVideowindowStoreData(windowviewid, 'minimised', isMinimize);
 
@@ -447,7 +448,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
         $rootScope.resetMenuOption();
         // call from while open module in CB
          //remove pre event
-         $("#vidImagePanel_" + windowviewid).off("click");
+        // $("#vidImagePanel_" + windowviewid).off("click");
 
          $("#vidImagePanel_" + windowviewid).on('click', function (event) {
               //after drawing annotation click not work on iPad/Android device
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/MyPictureController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/MyPictureController.js
index 3c480f3..5e3f48d 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/MyPictureController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/MyPictureController.js
@@ -224,8 +224,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
         var aiTitle = $scope.picOpenInOtherModules.anatomyTitle;
         $scope.SetPICwindowStoreData(windowviewid, 'currentViewTitle', aiTitle);
         localStorage.setItem("currentViewTitle", aiTitle);
-        var isMaximize = $scope.picOpenInOtherModules.maximised;
-        var isMinimize = $scope.picOpenInOtherModules.minimised;
+        var isMaximize = $scope.picOpenInOtherModules.maximised!=undefined?$scope.picOpenInOtherModules.maximised:false;
+        var isMinimize = $scope.picOpenInOtherModules.minimised!=undefined?$scope.picOpenInOtherModules.minimised:false;
+        
         $scope.SetPICwindowStoreData(windowviewid, 'maximised', isMaximize);
         $scope.SetPICwindowStoreData(windowviewid, 'minimised', isMinimize);
 
@@ -281,7 +282,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                     content: '<div>'+
                     ' <div class="container-fluid">'+
                     ' <div class="row">'+
-                    '<div class="img-thumbnail" style="overflow: hidden;width:100%;position:relative" id="canvasDivPIC_' + windowviewid + '" ><canvas id="canvasPaintPIC_' + windowviewid + '" ng-click="FreeStylePaint($event)"  width="2277" height="1000" class="canvas-annotationStyle1" style="position: absolute;z-index:0;left:0px"></canvas><canvas id="canvasPIC_' + windowviewid + '" ng-click="onDrawingCanvasClick($event)" width="2277" height="1000" class="canvas-annotationStyle" style="position: absolute; background-color: transparent;z-index:1;left:0px "></canvas>' +
+                    '<div class="img-thumbnail" style="overflow: scroll;width:100%;position:relative" id="canvasDivPIC_' + windowviewid + '" ><canvas id="canvasPaintPIC_' + windowviewid + '" ng-click="FreeStylePaint($event)"  width="2277" height="1000" class="canvas-annotationStyle1" style="position: absolute;z-index:0;left:0px"></canvas><canvas id="canvasPIC_' + windowviewid + '" ng-click="onDrawingCanvasClick($event)" width="2277" height="1000" class="canvas-annotationStyle" style="position: absolute; background-color: transparent;z-index:1;left:0px "></canvas>' +
                     '<img id="mypic_' + windowviewid + '" alt="" title="" style="left:0px;top:0px;position:absolute">' +
                     '</div>'+
                     '</div></div></div>',
@@ -374,10 +375,11 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                
                     $('.jsPanel-content .jsPanel-theme-success').css('overflow-y', 'auto !important')
                    
-                    $('#PicView').css("height", $(window).outerHeight() - 65);
-    
-                    $('#PicView').css("width", $(window).outerWidth() - 15);
-    
+                    if (!$rootScope.isCallFromOtherModule) {
+                        $('#PicView').css("height", $(window).outerHeight() - 65);   
+                        $('#PicView').css("width", $(window).outerWidth() - 15);
+                    }
+                    
                     var canvasDIvHeight = $('#picImagePanel_' + windowviewid+ " .jsPanel-content").height(); 
     
                     $('#canvasDivPIC_' + windowviewid).css('height', canvasDIvHeight-5);  
@@ -433,7 +435,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
         $rootScope.resetMenuOption();
 
         //remove pre event
-        $("#picImagePanel_" + windowviewid).off("click");
+       // $("#picImagePanel_" + windowviewid).off("click");
 
         $("#picImagePanel_" + windowviewid).on('click', function (event) {
              //after drawing annotation click not work on iPad/Android device
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
index 818f922..6505579 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
@@ -93,7 +93,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
                     'width': 0,
                     'height': 0,
                     'minimised': false,
-                    'maximised': false,
+                    'maximised': true,
                     'minmaxAutoEvent':true,
                     'id': 0,
                     'selectedPins': [],
@@ -508,10 +508,11 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
                                             $scope.SetAAwindowStoreData(windowviewid, 'isShowSelectedPins', $scope.aaOpenInOtherModules.showSelectedPins);
                                             if ($scope.aaOpenInOtherModules.showHideAnnotations != undefined && $scope.aaOpenInOtherModules.showHideAnnotations != "") {
                                                 $scope.SetAAwindowStoreData(windowviewid, 'showHideAnnotations', $scope.aaOpenInOtherModules.showHideAnnotations);
-                                              }       
-                                          
-                                            var isMaximize = $scope.aaOpenInOtherModules.maximised;
-                                            var isMinimize = $scope.aaOpenInOtherModules.minimised;
+                                              }  
+
+                                            var isMaximize = $scope.aaOpenInOtherModules.maximised!=undefined?$scope.aaOpenInOtherModules.maximised:false;
+                                            var isMinimize = $scope.aaOpenInOtherModules.minimised!=undefined?$scope.aaOpenInOtherModules.minimised:false;
+ 
                                             $scope.SetAAwindowStoreData(windowviewid, 'maximised', isMaximize);
                                             $scope.SetAAwindowStoreData(windowviewid, 'minimised', isMinimize);
                                             
@@ -619,7 +620,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
         }
         else {
             $scope.jsPanelWidth = $(window).outerWidth() - 20;
-            $scope.jsPanelHeight = $(window).outerHeight() - 150;
+            $scope.jsPanelHeight = $(window).outerHeight() - 140;
             $scope.jsPanelLeft = 1;
             $scope.jsPanelTop = 70;
         }
@@ -663,7 +664,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
                     }
                      $scope.SetAAwindowStoreData(windowviewid, 'maximised',true);
                      $scope.SetAAwindowStoreData(windowviewid, 'minimised',false);
-                     var canvasDIvHeight = $('#AAImagePanel_' + windowviewid+ " .jsPanel-content").height()-70;                    
+                     var canvasDIvHeight = $('#AAImagePanel_' + windowviewid+ " .jsPanel-content").height()-50;                    
                      $('#canvasAADiv_' + windowviewid).css('height', canvasDIvHeight);
                  },
                 onnormalized:function (panel) {
@@ -674,7 +675,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
                     }
                     $scope.SetAAwindowStoreData(windowviewid, 'minimised',false);
                     $scope.SetAAwindowStoreData(windowviewid, 'maximised',false);
-                    var canvasDIvHeight = $('#AAImagePanel_' + windowviewid+ " .jsPanel-content").height()-70;                    
+                    var canvasDIvHeight = $('#AAImagePanel_' + windowviewid+ " .jsPanel-content").height()-50;                    
                     $('#canvasAADiv_' + windowviewid).css('height', canvasDIvHeight);
                 },
                 resizable: {
@@ -684,7 +685,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
                         $scope.SetAAwindowStoreData(windowviewid, 'width', ui.size.width);
                         $scope.SetAAwindowStoreData(windowviewid, 'height', ui.size.height);
                         $rootScope.UnsaveCurriculum = true;
-                        var canvasDIvHeight = $('#AAImagePanel_' + windowviewid+ " .jsPanel-content").height()-70;                    
+                        var canvasDIvHeight = $('#AAImagePanel_' + windowviewid+ " .jsPanel-content").height()-50;                    
                         $('#canvasAADiv_' + windowviewid).css('height', canvasDIvHeight);
                     }
                     
@@ -761,16 +762,12 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
 
     $scope.loadAAModule = function (windowviewid) {
 
-            if ($rootScope.isCallFromOtherModule) {
-                var canvasDIvHeight = parseInt($('#AAImagePanel_' + windowviewid).outerHeight()) - 100;
-            }
-            else
-             {
-                var canvasDIvHeight = parseInt($('#AAImagePanel_' + windowviewid).outerHeight()) - 90;
+            if (!$rootScope.isCallFromOtherModule) {
                 $('#aaBodyView').css("height", $(window).outerHeight() - 65);
                 $('#aaBodyView').css("width", $(window).outerWidth() - 15);
             }
-
+           
+            var canvasDIvHeight = $('#AAImagePanel_' + windowviewid+ " .jsPanel-content").height()-50;
             $('#canvasAADiv_' + windowviewid).css('height', canvasDIvHeight);
             $('.canvasDivClass').css("height", canvasDIvHeight);                      
 
@@ -988,7 +985,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
         //call when module loaded 
         $rootScope.resetMenuOption();   
         //remove pre event
-        $("#AAImagePanel_" + windowviewid).off("click");
+       // $("#AAImagePanel_" + windowviewid).off("click");
 
         $("#AAImagePanel_" + windowviewid).on('click', function (event) {
              var pnlName=event.currentTarget.id;
diff --git a/400-SOURCECODE/AIAHTML5.Web/index.aspx b/400-SOURCECODE/AIAHTML5.Web/index.aspx
index dc3bf71..2fbb7a3 100644
--- a/400-SOURCECODE/AIAHTML5.Web/index.aspx
+++ b/400-SOURCECODE/AIAHTML5.Web/index.aspx
@@ -1181,12 +1181,12 @@
             </div>  
 
             <!--Export Image Modal-->
-            <div class="modal fade export-image ui-draggable in" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
+            <div class="modal fade export-image ui-draggable in" data-keyboard="false" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
                  style="z-index: 1200002;">
                 <div class="modal-dialog modal-sm" role="document">
                     <div class="modal-content">
                         <div class="modal-header annotation-modal-header ui-draggable-handle">
-                            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
+                            <button type="button" class="close" data-dismiss="modal" aria-label="Close" ng-click="CloseExportModal()"><span aria-hidden="true">×</span></button>
                             <h4 class="modal-title" id="">Save As</h4>
                         </div>
                         <div class="modal-body">
@@ -1195,7 +1195,7 @@
                                     <div class="form-group">
                                         <label for="filename">Filename:</label>
                                         <div class="input-group">
-                                            <input type="text" class="form-control" id="filename" placeholder="enter name" ng-model="filename">
+                                            <input type="text" class="form-control" id="exportfilename" placeholder="enter name" ng-model="exportfilename">
                                             <div class="input-group-addon">.jpg</div>
                                         </div>
                                     </div>
@@ -1213,12 +1213,12 @@
                     </div>
                 </div>
             </div>
-            <div class="modal fade export-image-ipad ui-draggable in" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
+            <div class="modal fade export-image-ipad ui-draggable in" data-keyboard="false" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
                  style="z-index: 1200002;">
                 <div class="modal-dialog modal-sm" role="document" style="width:400px">
                     <div class="modal-content">
                         <div class="modal-header annotation-modal-header ui-draggable-handle">
-                            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
+                            <button type="button" class="close" data-dismiss="modal" aria-label="Close" ng-click="CloseExportModal()"><span aria-hidden="true">×</span></button>
                             <h4 class="modal-title" id="">Download Export Image</h4>
                         </div>
                         <div class="modal-body" style="width: 400px; height: 100px; overflow-x: auto;">
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 cb00f24..1a27efc 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
@@ -76,10 +76,10 @@ var jsPanel = {
                 '<div class="jsPanel-hdr jsPanel-theme-default">' +
                     '<h3 class="jsPanel-title"></h3>' +
                     '<div class="jsPanel-hdr-r">' +
-                        '<div class="jsPanel-btn-close "><span class="jsglyph jsglyph-remove"></span></div>' +
-                        '<div class="jsPanel-btn-max"><span class="jsglyph jsglyph-maximize"></span></div>' +
-                         '<div class="jsPanel-btn-norm"><span class="jsglyph jsglyph-normalize"></span></div>' +
-                         '<div class="jsPanel-btn-min"><span id="minSpan" class="fa fa-minus"></span></div>' +
+                        '<div class="jsPanel-btn-close " title="close"><span class="jsglyph jsglyph-remove"></span></div>' +
+                        '<div class="jsPanel-btn-max" title="maximize"><span class="jsglyph jsglyph-maximize"></span></div>' +
+                         '<div class="jsPanel-btn-norm" title="restore"><span class="jsglyph jsglyph-normalize"></span></div>' +
+                         '<div class="jsPanel-btn-min" title="minimize"><span id="minSpan" class="fa fa-minus"></span></div>' +
 
                         //'<div class="jsPanel-btn-min"><span class="jsglyph jsglyph-minimize"></span></div>' +
                         //'<div class="jsPanel-btn-small"><span class="jsglyph jsglyph-chevron-up"></span></div>' +
@@ -135,7 +135,7 @@ var jsPanel = {
                 // title h3 might be to small: load() is async!
                 jsPanel.resizeTitle(panel);
                 // update option.size (content might come delayed)
-                jsPanel.updateOptionSize(panel, panel.option.size);
+                //jsPanel.updateOptionSize(panel, panel.option.size);
             })
             .then(function (data, textStatus, jqXHR) {
                 if (oAjax.then && $.isArray(oAjax.then)) {
@@ -145,7 +145,7 @@ var jsPanel = {
                     // title h3 might be to small: load() is async!
                     jsPanel.resizeTitle(panel);
                     // update option.size (content might come delayed)
-                    jsPanel.updateOptionSize(panel, panel.option.size);
+                    //jsPanel.updateOptionSize(panel, panel.option.size);
                 }
             }, function (jqXHR, textStatus, errorThrown) {
                 if (oAjax.then && $.isArray(oAjax.then)) {
@@ -775,7 +775,7 @@ var jsPanel = {
             // title h3 might be to small: load() is async!
             jsPanel.resizeTitle(panel);
             // update option.size (content might come delayed)
-            jsPanel.updateOptionSize(panel, panel.option.size);
+            //jsPanel.updateOptionSize(panel, panel.option.size);
             // fix for a bug in jQuery-UI draggable? that causes the jsPanel to reduce width when dragged beyond boundary of containing element and option.size.width is 'auto'
             panel.content.css('width', function () {
                 return panel.content.outerWidth();
@@ -858,52 +858,33 @@ var jsPanel = {
             //birendra
             var currentController = panel.option.currentController;
                     if (pathname == "/curriculum-builder-detail")
-                    {
-                       
-                        
-                        if (currentController == 'DAController') {                         
-                            var len=  (panel.option.id).split("_").length;
-                            var MultiWinId = (panel.option.id).split("_")[len-1];
-                            $('#canvasDivDA_' + MultiWinId).css('height', 460);
-                           
-                        }
-                        else if(currentController == 'TileViewListController')
-                        {
-                            var len=  (panel.option.id).split("_").length;
-                            var MultiWinId = (panel.option.id).split("_")[len-1];
-                            $('#canvasAADiv_' + MultiWinId).css('height', 490);
-            
-                        }
-                        else if (currentController == "CIController")
-                        {
-                            
-                            var len = (panel.option.id).split("_").length;
-                            var MultiWinId = (panel.option.id).split("_")[len - 1];
-                            $('#canvasDivCI_' + MultiWinId).css('height', 450);
-                        }
-                        else
-                        {
-                            // add for other module like AI when implemt for CB
-                            $('#canvasDiv').css('height', 470);
-                        }
-                      
-                        panel.css({
+                    {                     
+                        var ht=$("#cbdivarea").height()-100;
+						var wt= $("#cbdivarea").width();
+                       panel.css({
                             top: parseInt(80),
-                            left: parseInt(320),
-                            width: currentController == 'CIController' ? 1010 : 1025,
-                            height: currentController == 'CIController' ? 550 : currentController == 'CAController' ? 545: 580,
+                            left:parseInt(10),
+                            width: wt,
+                            height:ht,
                         });
+					  
 
                     }
                     else
                     {
-                        var ht=parseInt(panel.parent().outerHeight()) - parseInt(panel.option.maximizedMargin.top) - parseInt(panel.option.maximizedMargin.bottom) - 65;
+						//disable resize and drag on full screen
+						// panel.resizable({ disabled: true });
+                        // panel.draggable({ disabled: true });
+						//maximize
+						var screenWidth =screen.width-20;
+						var screenHeight =screen.height<1024 ?screen.height-80:screen.height-230;
+                        var ht=$(window).outerHeight()-10 - parseInt(panel.option.maximizedMargin.top) - parseInt(panel.option.maximizedMargin.bottom) - 65;
+						var wt=$(window).outerWidth()-10 - parseInt(panel.option.maximizedMargin.left) - parseInt(panel.option.maximizedMargin.right);
                         panel.css({
                             top: parseInt(70),//panel.option.maximizedMargin.top),
-                            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
-                            height: currentController == 'MyAnimationController' ? 510 : ht
+                            left:parseInt(panel.option.maximizedMargin.left),
+                            width: currentController == 'CAController' ? screenWidth: currentController == '3dAController' ? screenWidth: wt,
+                            height:currentController == '3dAController' ? screenHeight: ht,
                         });
             
 
@@ -977,8 +958,8 @@ var jsPanel = {
         });
         // update panel size to have correct values when normalizing again
         if (panel.status === "normalized" || panel.option.panelstatus === "normalized") {
-            panel.option.size.width = panel.outerWidth();
-            panel.option.size.height = panel.outerHeight();
+            //panel.option.size.width = panel.outerWidth();
+            //panel.option.size.height = panel.outerHeight();
         }
         panel.animate({
             opacity: 0
@@ -1063,32 +1044,6 @@ var jsPanel = {
         if (pathname == "/curriculum-builder-detail")
         {         
           
-            if (currentController == 'DAController') {                         
-                var len=  (panel.option.id).split("_").length;
-                var MultiWinId = (panel.option.id).split("_")[len-1];
-                $('#canvasDivDA_' + MultiWinId).css('height', (parseInt(panel.option.size.height, 10)-100));
-               
-            }
-            else if(currentController == 'TileViewListController')
-            {
-                var len=  (panel.option.id).split("_").length;
-                var MultiWinId = (panel.option.id).split("_")[len-1];
-                $('#canvasAADiv_' + MultiWinId).css('height', (parseInt(panel.option.size.height, 10)-70));
-
-            }
-            else if (currentController == 'CIController') {
-                var len = (panel.option.id).split("_").length;
-                var MultiWinId = (panel.option.id).split("_")[len - 1];
-                $('#canvasDivCI_' + MultiWinId).css('height', (parseInt(panel.option.size.height, 10) - 70));
-
-            }           
-            else
-            {
-                // add for other module like CI,AI when implemt for CB
-                $('#canvasDiv').css('height', (parseInt(panel.option.size.height, 10)-100));
-
-            }
-          
             panel.css({
                 width: panel.option.size.width,
                 height: currentController == 'CIController' ? parseInt(panel.option.size.height, 10) : currentController == 'CAController' ? parseInt(panel.option.size.height, 10) : parseInt(panel.option.size.height, 10) + 35,
@@ -1100,9 +1055,11 @@ var jsPanel = {
         }
         else
         {
+			var ht=$(window).outerHeight()-panel.option.size.height<200?$(window).outerHeight()-200:panel.option.size.height;
+			var wt=screen.width<1025?screen.width-100:$(window).innerWidth()-panel.option.size.width<300?$(window).innerWidth()-300:panel.option.size.width;
             panel.css({
-                width: currentController == 'CIController' ? panel.option.size.width - 18 : panel.option.size.width,         
-                height: currentController == 'CAController' ? parseInt(panel.option.size.height, 10) : parseInt(panel.option.size.height, 10) + 35,
+                width: wt,         
+                height:ht,
                 top: panelTop,
                 left: panel.option.position.left
             });
@@ -1431,14 +1388,11 @@ var jsPanel = {
             if (jspanel.attr("id") !== $(elmt).attr("id")) {
 
                 var pathname = window.location.pathname; 
-                //birendra
-                if (pathname == "/curriculum-builder-detail") {
                     var zindex = $(elmt).css("z-index");
                     if (zindex = "auto") {
                         $(elmt).css('z-index', '1');
                     }
-                }
-              
+                          
                 allZi.push($(elmt).css("z-index"));
                
             }
@@ -2447,7 +2401,7 @@ console.log("jsPanel version: " + jsPanel.version);
         "onbeforeminimize": false,
         "onbeforenormalize": false,
         "onclosed": false,
-        "oncmaximized": false,
+        "onmaximized": false,
         "onminimized": false,
         "onnormalized": false,
         "overflow": 'hidden',
--
libgit2 0.21.4