modified the changes in arrangement panel

Birendra
1 parent ed1ea70c
Showing 15 changed files with 152 additions and 90 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/AIController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/AODController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/MyAnimationController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/MyPictureController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
400-SOURCECODE/AIAHTML5.Web/app/views/CBuild/curriculum-builder-detail.html
400-SOURCECODE/AIAHTML5.Web/libs/jquery/jquery_plugin/jsPanel/jspanel/jquery.jspanel.js
@@ -411,15 +411,15 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
                $scope.jsPanelHeight = 560;
             $scope.jsPanelLeft = $scope.ThreeDOpenInOtherModules.position.x;
-            if ($scope.ThreeDOpenInOtherModules.position.x < 1)           
-            $scope.jsPanelLeft = 1;
+            if ($scope.ThreeDOpenInOtherModules.position.x <= 1)           
+            $scope.jsPanelLeft = 0;
             $scope.jsPanelTop = $scope.ThreeDOpenInOtherModules.position.y;
             if ($scope.ThreeDOpenInOtherModules.position.y < 30)           
             $scope.jsPanelTop = 30;
             if($location.url()!= "/curriculum-builder-detail") {
-                    $scope.jsPanelLeft = 10;
-                    $scope.jsPanelTop = 90;
+                    $scope.jsPanelLeft = 1;
+                    $scope.jsPanelTop = 85;
             }
         }
@@ -1162,15 +1162,15 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                $scope.jsPanelHeight = 540;
             $scope.jsPanelLeft = $scope.aiOpenInOtherModules.position.x;
-            if ($scope.aiOpenInOtherModules.position.x < 1)           
-            $scope.jsPanelLeft =1;
+            if ($scope.aiOpenInOtherModules.position.x <= 1)           
+            $scope.jsPanelLeft =0;
             $scope.jsPanelTop = $scope.aiOpenInOtherModules.position.y;
             if ($scope.aiOpenInOtherModules.position.y < 30)           
             $scope.jsPanelTop = 30;
             if($location.url()!= "/curriculum-builder-detail") {
-                    $scope.jsPanelLeft = 10;
-                    $scope.jsPanelTop = 90;
+                    $scope.jsPanelLeft = 1;
+                    $scope.jsPanelTop = 85;
             }
         }
         else {
@@ -1323,13 +1323,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                     canvasPaint.height = screen.height-280;
                     canvas.width = screen.width-40;
                     canvasPaint.width = screen.width-40;
-                    if($location.url()== "/curriculum-builder-detail") {
-                    canvas.height = screen.height-300;
-                    canvasPaint.height = screen.height-300;
-                    canvas.width = screen.width-370;
-                    canvasPaint.width = screen.width-370;
-                    }
-                        
                 }
                 $scope.SetAIwindowStoreData(windowviewid, 'currentSlug', 'adam-images-detail');
@@ -361,7 +361,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
         var uid =  $scope.GetAODwindowStoreData(windowviewid, 'uid');
         var requestType =  $scope.GetAODwindowStoreData(windowviewid, 'requestType');
         var aodSiteUrl = aodlink+"?SessionId=" +  $rootScope.userData.SessionId + "&Courseid=" + courseid + "&type="+requestType +"&uID=" + uid+ ",_self";
-       // var aodSiteUrl = aodlink+"?SessionId=1625041740906" + "&Courseid=" + courseid + "&type="+requestType +"&uID=" + uid+ ",_self";
+        //var aodSiteUrl = aodlink+"?SessionId=1625199179202" + "&Courseid=" + courseid + "&type="+requestType +"&uID=" + uid+ ",_self";
         $scope.jsPanelWidth = $(window).outerWidth() - 20;
         $scope.jsPanelHeight = $(window).outerHeight() - 140;
@@ -376,7 +376,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                     currentController: 'AODController',
                     parentSlug: $scope.GetAODwindowStoreData(windowviewid, 'parentSlugName'),
                     content: '<div id="aodContentDiv_'+windowviewid+'" style="height: 100%; width: 100%; overflow: scroll;" >' +
-                    '<iframe name="aodFrame" src="" style="width: 100%;height:100%"  id="aodvideo_' + windowviewid + '" onload="MyAODvideoOnLoad(event)"></iframe>'+
+                    '<iframe name="aodFrame" src="" style="width: 100%;height:100%"  id="aodvideo_' + windowviewid + '" onload="MyAODvideoOnLoad(event)" allow="autoplay" allowfullscreen></iframe>'+
                     '</div><script>$(document).ready(function(){var $ua = navigator.userAgent; if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {var threeDivWidth = $("#AODView").css("width");$("#AODView").css({"left":"0px","width":"100%","min-idth": threeDivWidth}); var jspanelContainerWidth = $(".jsPanel-content").css("width"); $(".jsPanel-content").css({ "width": "100%", "min-width": jspanelContainerWidth}); $("#aodImagePanel_' + windowviewid + '").css("width", "100%"); }});</script>',
                     title: tittle,
                     position: {
@@ -964,15 +964,15 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                        $scope.jsPanelHeight = 510;
                        $scope.jsPanelLeft = $scope.caOpenInOtherModules.position.x;
-                       if ($scope.caOpenInOtherModules.position.x < 1)           
-                       $scope.jsPanelLeft = 1;
+                       if ($scope.caOpenInOtherModules.position.x <= 1)           
+                       $scope.jsPanelLeft = 0;
                        $scope.jsPanelTop = $scope.caOpenInOtherModules.position.y;
                        if ($scope.caOpenInOtherModules.position.y < 30)           
                        $scope.jsPanelTop = 30;
                        if($location.url()!= "/curriculum-builder-detail") {
-                               $scope.jsPanelLeft = 10;
-                               $scope.jsPanelTop = 90;
+                               $scope.jsPanelLeft = 1;
+                               $scope.jsPanelTop = 85;
                        }
                  }
@@ -947,15 +947,15 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                    $scope.jsPanelHeight = 540;
                    $scope.jsPanelLeft = $scope.ciOpenInOtherModules.position.x;
-                   if ($scope.ciOpenInOtherModules.position.x < 1)           
-                   $scope.jsPanelLeft = 1;
+                   if ($scope.ciOpenInOtherModules.position.x <= 1)           
+                   $scope.jsPanelLeft = 0;
                    $scope.jsPanelTop = $scope.ciOpenInOtherModules.position.y;
                    if ($scope.ciOpenInOtherModules.position.y < 30)           
                    $scope.jsPanelTop = 30;
                    if($location.url()!= "/curriculum-builder-detail") {
-                           $scope.jsPanelLeft = 10;
-                           $scope.jsPanelTop = 90;
+                           $scope.jsPanelLeft = 1;
+                           $scope.jsPanelTop = 85;
                    }
             }
@@ -1133,12 +1133,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                         canvasPaint.width = screen.width-40;
                         canvas.height = screen.height-400;
                         canvasPaint.height = screen.height-400;
-                        
-                        if($location.url()== "/curriculum-builder-detail") {                     
-                        canvas.width = screen.width-370;
-                        canvasPaint.width = screen.width-370;
-                        }
-                       
                     }
                     if(screen.height<400)
                     {
@@ -32,13 +32,13 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
         var $ua = navigator.userAgent;
             if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
-                $("#treecontent").css('height',screen.height-140);
-                $("#cbdivarea").css('height',screen.height-70);
+                $("#treecontent").css('height',screen.height-130);
+                $("#cbdivarea").css('height',screen.height-60);
             }
             else
             {
-             $("#treecontent").css('height',screen.height-280);
-             $("#cbdivarea").css('height',screen.height-210);
+             $("#treecontent").css('height',screen.height-270);
+             $("#cbdivarea").css('height',screen.height-200);
             }
         $('#sidebar-wrapper').unbind('click');
@@ -722,9 +722,10 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
             title: $rootScope.cbTreeFirstLabel,
             position: {
-                top: 1,
-                left:1,
+                top: 0,
+                left:0,
             },
+            draggable: "disabled",
             controls: { buttons: 'closeonly' },
             size: { width: 820, height: 450 },
@@ -736,7 +737,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
                 $("#CBTextArea_ifr").css("display", "block");
               });
-            $('#CBTinyMCEPanel').draggable({ containment: '#cbdivarea', scroll: false });      
+          // $('#CBTinyMCEPanel').draggable({ containment: '#cbdivarea', scroll: false });      
         }, 200);
@@ -2380,6 +2381,38 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
         $("#modal-CurBuilder").draggable();
     });
+    $rootScope.cbTreeToggleClick = function () {
+        setTimeout(function(){
+            // reset minimize panel while tree toggle click
+
+            if($('div.CBLeft-Sidebar').hasClass('active'))
+            {
+                $('#jsPanel-min-container').css('left','15px');
+            }
+            else
+            {
+                $('#jsPanel-min-container').css('left','300px');
+            }
+            
+            var modulePanel = $("div[id*='ImagePanel']");
+            if (modulePanel != undefined && modulePanel != null) {              
+                if (modulePanel.length > 0) {
+                    for (var i = 0 ; i < modulePanel.length; i++) {
+                        var paneld = modulePanel[i].id;
+                        var containmentTop = $("#cbdivarea").position().top+10;
+                        var containmentLeft = $("#cbdivarea").position().left;
+                        //overrride containment of module on curriculum builder
+                        $('#'+paneld).draggable(
+                            { 
+                              containment : [containmentLeft,containmentTop,5000,4000]//[left,top,right,bottom]
+                            });
+                    }
+                }
+            }
+
+        },200)
+        
+    }
     $scope.loadContentOfSelectedSlide = function (id) {
         $('#errorMessage').text("");
@@ -2539,7 +2572,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
             else { 
                  //Added Code by sandeep for user story-52696              
                 $("#viwerSelect").empty();
-                var modulePanel = $("#HomeContainerDiv").find("div[id*='ImagePanel']");
+                var modulePanel = $("div[id*='ImagePanel']");
                 if (modulePanel != undefined && modulePanel != null) {              
                     //Added code by sandeep for fixed Bug-58066
                     if (modulePanel.length > 0) {
@@ -2553,7 +2586,13 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
                     var paneld = modulePanel[i].id;
                     var panelTitle = document.getElementById(paneld).childNodes[0].innerText;
                     $('#viwerSelect').append('<option value="' + paneld + '">' + panelTitle + '</option>');
-                    $('#'+paneld).draggable({ containment: '#cbdivarea', scroll: false });
+                    var containmentTop = $("#cbdivarea").position().top+10;
+                    var containmentLeft = $("#cbdivarea").position().left;
+                    //overrride containment of module on curriculum builder
+                    $('#'+paneld).draggable(
+                        { 
+                          containment : [containmentLeft,containmentTop,5000,4000]//[left,top,right,bottom]
+                        });
                 }
                 $scope.CBEnableUI();
@@ -936,15 +936,15 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                                $scope.jsPanelHeight = 450;
                             $scope.jsPanelLeft = $scope.daOpenInOtherModules.position.x;
-                            if ($scope.daOpenInOtherModules.position.x < 1)           
-                            $scope.jsPanelLeft = 1;
+                            if ($scope.daOpenInOtherModules.position.x <= 1)           
+                            $scope.jsPanelLeft = 0;
                             $scope.jsPanelTop = $scope.daOpenInOtherModules.position.y;
                             if ($scope.daOpenInOtherModules.position.y < 30)           
                             $scope.jsPanelTop = 30;
                             if($location.url()!= "/curriculum-builder-detail") {
-                                    $scope.jsPanelLeft = 10;
-                                    $scope.jsPanelTop = 90;
+                                    $scope.jsPanelLeft = 1;
+                                    $scope.jsPanelTop = 85;
                             }
                         }
@@ -2327,6 +2327,10 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
          };
          $rootScope.AllPanelStoreObject.push(windata);
+         $(".jsPanel").draggable({
+            containment : [0,55,5000,4000]//[left,top,right,bottom]
+        });
+      
     }
     $rootScope.orientationchangeToMax=function(windowviewid)
@@ -2358,8 +2362,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
         if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {                 
            $('#arragePannel .dropdown-content').css("display","block");
         }
-        
-
+          
         $(window).unbind('resize');
         window.addEventListener("resize", orientationchange); 
         function orientationchange() {                  
@@ -2369,7 +2372,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
                 if (moduleImagePanel.length > 0) {
                     for (var j = 0; j < moduleImagePanel.length; j++) {
-                        var paneld=moduleImagePanel[j].id;
+                        var paneld=moduleImagePanel[j].id;   
                         var len = (paneld).split("_").length;
                         var MultiWinId = (paneld).split("_")[len - 1]; 
@@ -2686,16 +2689,15 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
         var resetWidth=0;
         if($location.url()== "/curriculum-builder-detail") {
              pTop = 30;
-             pLeft = 1;
+             pLeft = 0;
           }
         var moduleImagePanel = $("div[id*='ImagePanel']");
          if (moduleImagePanel.length > 0) {
             var resetWidth=($(window).innerWidth()-30)/2;
-            for (var j = 0; j < moduleImagePanel.length; j++) {
-                var paneld=moduleImagePanel[j].id;
-              
+            for (var j = 0; j < moduleImagePanel.length; j++) {    
+                var paneld=moduleImagePanel[j].id;         
                 var len = (paneld).split("_").length;
                 var MultiWinId = (paneld).split("_")[len - 1]; 
                 $rootScope.orientationchangeToNormal(MultiWinId);
@@ -2708,6 +2710,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
                 $("#"+paneld).css('top',pTop);
                 $("#"+paneld).css('left',pLeft);
+                $("#"+paneld+" .jsPanel-hdr .jsPanel-title").css('width','300px');
                 $("#"+paneld).css('width',resetWidth);
                 $("#"+paneld+' .jsPanel-content').css('width',resetWidth);
                 $("#"+paneld).css('z-index',j+1000);
@@ -2727,7 +2730,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
             var countreset=0;
             if($location.url()== "/curriculum-builder-detail") {
                 pTop = 30;
-                pLeft = 1;
+                pLeft = 0;
              }
              var countnumber=0;
             var moduleImagePanel = $("div[id*='ImagePanel']");
@@ -2737,10 +2740,17 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
                 if(moduleImagePanel.length<=2)
                 {
                     resetWidth=($(window).innerWidth()-30)/2;
+                    if($location.url()== "/curriculum-builder-detail") {
+                        resetWidth=($(window).innerWidth()-60)/2;
+                    }
+                    
                 }
                 else if(moduleImagePanel.length>=3)
                 {
                     resetWidth=($(window).innerWidth()-30)/3;
+                    if($location.url()== "/curriculum-builder-detail") {
+                        resetWidth=($(window).innerWidth()-65)/3;
+                    }
                 }
                 for (var j = 0; j < moduleImagePanel.length; j++) {
@@ -2754,21 +2764,22 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
                     //set max tiles 3 on screen width
                     if(countnumber>1 && countnumber<4)
                     {
-                        pLeft = pLeft+resetWidth+10;                
+                        pLeft = pLeft+resetWidth+5;                
                     }
                     else if(countnumber>=4)
                     {
                         countreset=countreset+1;
                         countnumber=1;
-                         pTop = 55+10+countreset*520;
+                         pTop = 55+5+countreset*520;
                          pLeft = 1;
                         if($location.url()== "/curriculum-builder-detail") {
-                            pTop = 35+10+countreset*520;
+                            pTop = 35+5+countreset*520;
                             pLeft = 1;
                         }
                     }
+                    $("#"+paneld+" .jsPanel-hdr .jsPanel-title").css('width','300px');// remove extra tile width
                     $("#"+paneld).css('width',resetWidth);
                     $("#"+paneld+' .jsPanel-content').css('width',resetWidth);
@@ -9015,7 +9026,10 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
                 else if (canvas.id.match("canvasDivPIC")) {
                     var curModule = 'MY_PICTURES';
                 }
-                
+
+                $(".jsPanel").draggable({
+                    containment : [0,55,5000,4000]//[left,top,right,bottom]
+                });
                // var curPosture = $rootScope.getLocalStorageValue('currentViewTitle');
                 var curPosture = panelTitle;
@@ -9358,7 +9372,14 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
         sessionStorage.removeItem('isModuleOpenByOpenResource');
          $("#jsPanel-min-container").removeAttr("style");
          if (document.location.pathname == "/curriculum-builder-detail") {
-            $("#jsPanel-min-container").css( 'left', '300px' );         
+            if($('div.CBLeft-Sidebar').hasClass('active'))
+            {
+                $('#jsPanel-min-container').css('left','15px');
+            }
+            else
+            {
+                $('#jsPanel-min-container').css('left','300px');
+            }         
         }
     });
@@ -9792,7 +9813,14 @@ function AIAModuleOpenResourceInfo(windowData) {
     var scope = angular.element(document.querySelector('[ng-controller="HomeController"]')).scope();
     scope.$apply(function () {
         if (document.location.pathname == "/curriculum-builder-detail") {
-            $("#jsPanel-min-container").css( 'left', '300px' );         
+            if($('div.CBLeft-Sidebar').hasClass('active'))
+            {
+                $('#jsPanel-min-container').css('left','15px');
+            }
+            else
+            {
+                $('#jsPanel-min-container').css('left','300px');
+            }             
         }
         scope.AIAModuleOpenResourceInfo(windowData);
     });
@@ -366,15 +366,15 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
                $scope.jsPanelHeight = 450;
             $scope.jsPanelLeft = $scope.leOpenInOtherModules.position.x;
-            if ($scope.leOpenInOtherModules.position.x < 1)           
-            $scope.jsPanelLeft = 1;
+            if ($scope.leOpenInOtherModules.position.x <= 1)           
+            $scope.jsPanelLeft = 0;
             $scope.jsPanelTop = $scope.leOpenInOtherModules.position.y;
             if ($scope.leOpenInOtherModules.position.y < 30)           
             $scope.jsPanelTop = 30;
             if($location.url()!= "/curriculum-builder-detail") {
-                    $scope.jsPanelLeft = 10;
-                    $scope.jsPanelTop = 90;
+                    $scope.jsPanelLeft = 1;
+                    $scope.jsPanelTop = 85;
             }
         }
@@ -275,15 +275,15 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                 $scope.jsPanelHeight = 400;
             $scope.jsPanelLeft = $scope.VidOpenInOtherModules.position.x;
-            if ($scope.VidOpenInOtherModules.position.x < 1)           
-            $scope.jsPanelLeft = 1;
+            if ($scope.VidOpenInOtherModules.position.x <= 1)           
+            $scope.jsPanelLeft = 0;
             $scope.jsPanelTop = $scope.VidOpenInOtherModules.position.y;
             if ($scope.VidOpenInOtherModules.position.y < 30)           
             $scope.jsPanelTop = 30;
             if($location.url()!= "/curriculum-builder-detail") {
-                    $scope.jsPanelLeft = 10;
-                    $scope.jsPanelTop = 90;
+                    $scope.jsPanelLeft = 1;
+                    $scope.jsPanelTop = 85;
             }
             if (animationSource.length > 0 ) {
@@ -300,8 +300,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                         ' nonad="' + animationSource + '"' +
                         ' nonhd="' + animationSource + '">' +
                         ' <source type="video/mp4" src="' + animationSource + '">' +
-                        '<object width="640" height="400"' +
-                        ' type="application/x-shockwave-flash" data="//vjs.zencdn.net/3.2/video-js.swf"><param name="allowfullscreen" value="true">' +
+                        '<object width="640" height="400" type="application/x-shockwave-flash" data="//vjs.zencdn.net/3.2/video-js.swf">'+
+                        '<param name="allowfullscreen" value="true">' +
                         ' <param name="allowscriptaccess" value="always"><param name="movie" value="//vjs.zencdn.net/3.2/video-js.swf">' +
                         ' <param name="flashvars" ng-value="controls=true&amp;file=' + animationSource + '"><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></div>',
@@ -265,15 +265,15 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                $scope.jsPanelHeight = 540;
                 $scope.jsPanelLeft = $scope.picOpenInOtherModules.position.x;
-                if ($scope.picOpenInOtherModules.position.x < 1)           
-                $scope.jsPanelLeft = 1;
+                if ($scope.picOpenInOtherModules.position.x <= 1)           
+                $scope.jsPanelLeft = 0;
                 $scope.jsPanelTop = $scope.picOpenInOtherModules.position.y;
                 if ($scope.picOpenInOtherModules.position.y < 30)           
                 $scope.jsPanelTop = 30;
                 if($location.url()!= "/curriculum-builder-detail") {
-                        $scope.jsPanelLeft = 10;
-                        $scope.jsPanelTop = 90;
+                        $scope.jsPanelLeft = 1;
+                        $scope.jsPanelTop = 85;
                 }
                 $scope.jsPanelPIC =  $.jsPanel({
@@ -415,12 +415,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                         canvasPaint.height = screen.height-280;
                         canvas.width = screen.width-40;
                         canvasPaint.width = screen.width-40;
-                        if($location.url()== "/curriculum-builder-detail") {
-                        canvas.height = screen.height-300;
-                        canvasPaint.height = screen.height-300;
-                        canvas.width = screen.width-370;
-                        canvasPaint.width = screen.width-370;                      
-                        }
                     }
@@ -609,15 +609,15 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
             $scope.jsPanelHeight = 420;
             $scope.jsPanelLeft = $scope.aaOpenInOtherModules.position.x;
-            if ($scope.aaOpenInOtherModules.position.x < 1)           
-            $scope.jsPanelLeft = 1;
+            if ($scope.aaOpenInOtherModules.position.x <= 1)           
+            $scope.jsPanelLeft = 0;
             $scope.jsPanelTop = $scope.aaOpenInOtherModules.position.y;
             if ($scope.aaOpenInOtherModules.position.y < 30)           
             $scope.jsPanelTop = 30;
             if($location.url()!= "/curriculum-builder-detail") {
-                    $scope.jsPanelLeft = 10;
-                    $scope.jsPanelTop = 90;
+                    $scope.jsPanelLeft = 1;
+                    $scope.jsPanelTop = 85;
             }
         }
@@ -308,7 +308,7 @@ AIA.constant(&#39;Modules&#39;, [
          Name: 'The Wellness Tools',
      },
      {
-         Id: 1017, // Updated from 17 to 1017 to match with database Id
+         Id: 17,
          Name: 'A.D.A.M. OnDemand',
      },
@@ -12,7 +12,7 @@
         width: 300px;
         padding-top: 0px;
         background: #222;
-        padding-top: 20px;
+        padding-top: 10px;
         position: absolute !important;
         left: 0;
     }
@@ -51,7 +51,7 @@
     <div ng-include="aap/widget/MainMenu.html"></div>
     <div class=" " id="CBDetailPageDiv" ng-controller="CurrBuildController">
         <div class="pos-relative leftToolBar CBLeft-Sidebar pull-left">
-            <div class="toggle-icon toggleBar toggleHeadingButton" title="Show/Hide Sidebar" style="top:20px;left:285px"></div>
+            <div class="toggle-icon toggleBar toggleHeadingButton" title="Show/Hide Sidebar" style="top:20px;left:285px"  onclick="cbTreeToggleClick()"></div>
             <div class="col-xs-12">
                 <div id="sidebar-wrapper" class="sidebar-lft">
                     <div class="row">
@@ -114,7 +114,7 @@
         </div>
         <div class="CB-JS-Panel">
-            <div id="cbdivarea" class="col-sm-12 stickey-area" style="overflow:scroll;margin-top:20px;background-color: #afacac;">
+            <div id="cbdivarea" class="col-sm-12 stickey-area" style="overflow:scroll;margin-top:10px;background-color: #afacac;">
                 <div ng-init="openCBJsPanel()" id="CBPanelDiv" class="CBBodyView"></div>
                 <div id="cbparentcustomDiv"></div>                  
                 <div id="cbModelDeleteBackground"></div>
@@ -373,6 +373,10 @@
         });
     });
+    function cbTreeToggleClick() {
+    angular.element(document.querySelector('[ng-controller="CurrBuildController"]')).scope().cbTreeToggleClick();
+    }
+
 </script>
 <script>
     function removeSpaces(string)
@@ -859,11 +859,11 @@ var jsPanel = {
             var currentController = panel.option.currentController;
                     if (pathname == "/curriculum-builder-detail")
                     {                     
-                        var ht=$("#cbdivarea").height()-55;
+                        var ht=$("#cbdivarea").height()-15;
 						var wt= $("#cbdivarea").width()+8;
                        panel.css({
-                            top: parseInt(30),
-                            left:parseInt(1),
+                            top:0,// parseInt(30),
+                            left:0,//parseInt(1),
                             width: wt,
                             height:ht,
                         });
@@ -988,7 +988,17 @@ var jsPanel = {
             var pathname = window.location.pathname; 
             if (pathname == "/curriculum-builder-detail")
             {
-                $('body').append('<div id="jsPanel-min-container" style="left:300px"></div>');
+                // reset minimize panel while tree toggle click
+
+                if($('div.CBLeft-Sidebar').hasClass('active'))
+                {
+                    $('body').append('<div id="jsPanel-min-container" style="left:15px"></div>');
+                }
+                else
+                {
+                    $('body').append('<div id="jsPanel-min-container" style="left:300px"></div>');
+                }
+               
             }
             else
             {