ADAM / AIAHTML5

Commit 8316d5ef84761f36753972f20e3174723f819a7d

Authored by Birendra
1 parent ed1ea70c

modified the changes in arrangement panel

Inline Side-by-side
Showing 15 changed files with 152 additions and 90 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js
  View file @8316d5e
... ... @@ -411,15 +411,15 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
411 411 $scope.jsPanelHeight = 560;
412 412  
413 413 $scope.jsPanelLeft = $scope.ThreeDOpenInOtherModules.position.x;
414   - if ($scope.ThreeDOpenInOtherModules.position.x < 1)
415   - $scope.jsPanelLeft = 1;
  414 + if ($scope.ThreeDOpenInOtherModules.position.x <= 1)
  415 + $scope.jsPanelLeft = 0;
416 416 $scope.jsPanelTop = $scope.ThreeDOpenInOtherModules.position.y;
417 417 if ($scope.ThreeDOpenInOtherModules.position.y < 30)
418 418 $scope.jsPanelTop = 30;
419 419  
420 420 if($location.url()!= "/curriculum-builder-detail") {
421   - $scope.jsPanelLeft = 10;
422   - $scope.jsPanelTop = 90;
  421 + $scope.jsPanelLeft = 1;
  422 + $scope.jsPanelTop = 85;
423 423 }
424 424  
425 425 }
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/AIController.js
  View file @8316d5e
... ... @@ -1162,15 +1162,15 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
1162 1162 $scope.jsPanelHeight = 540;
1163 1163  
1164 1164 $scope.jsPanelLeft = $scope.aiOpenInOtherModules.position.x;
1165   - if ($scope.aiOpenInOtherModules.position.x < 1)
1166   - $scope.jsPanelLeft =1;
  1165 + if ($scope.aiOpenInOtherModules.position.x <= 1)
  1166 + $scope.jsPanelLeft =0;
1167 1167 $scope.jsPanelTop = $scope.aiOpenInOtherModules.position.y;
1168 1168 if ($scope.aiOpenInOtherModules.position.y < 30)
1169 1169 $scope.jsPanelTop = 30;
1170 1170  
1171 1171 if($location.url()!= "/curriculum-builder-detail") {
1172   - $scope.jsPanelLeft = 10;
1173   - $scope.jsPanelTop = 90;
  1172 + $scope.jsPanelLeft = 1;
  1173 + $scope.jsPanelTop = 85;
1174 1174 }
1175 1175 }
1176 1176 else {
... ... @@ -1323,13 +1323,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
1323 1323 canvasPaint.height = screen.height-280;
1324 1324 canvas.width = screen.width-40;
1325 1325 canvasPaint.width = screen.width-40;
1326   - if($location.url()== "/curriculum-builder-detail") {
1327   - canvas.height = screen.height-300;
1328   - canvasPaint.height = screen.height-300;
1329   - canvas.width = screen.width-370;
1330   - canvasPaint.width = screen.width-370;
1331   - }
1332   -
1333 1326 }
1334 1327  
1335 1328 $scope.SetAIwindowStoreData(windowviewid, 'currentSlug', 'adam-images-detail');
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/AODController.js
  View file @8316d5e
... ... @@ -361,7 +361,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
361 361 var uid = $scope.GetAODwindowStoreData(windowviewid, 'uid');
362 362 var requestType = $scope.GetAODwindowStoreData(windowviewid, 'requestType');
363 363 var aodSiteUrl = aodlink+"?SessionId=" + $rootScope.userData.SessionId + "&Courseid=" + courseid + "&type="+requestType +"&uID=" + uid+ ",_self";
364   - // var aodSiteUrl = aodlink+"?SessionId=1625041740906" + "&Courseid=" + courseid + "&type="+requestType +"&uID=" + uid+ ",_self";
  364 + //var aodSiteUrl = aodlink+"?SessionId=1625199179202" + "&Courseid=" + courseid + "&type="+requestType +"&uID=" + uid+ ",_self";
365 365  
366 366 $scope.jsPanelWidth = $(window).outerWidth() - 20;
367 367 $scope.jsPanelHeight = $(window).outerHeight() - 140;
... ... @@ -376,7 +376,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
376 376 currentController: 'AODController',
377 377 parentSlug: $scope.GetAODwindowStoreData(windowviewid, 'parentSlugName'),
378 378 content: '<div id="aodContentDiv_'+windowviewid+'" style="height: 100%; width: 100%; overflow: scroll;" >' +
379   - '<iframe name="aodFrame" src="" style="width: 100%;height:100%" id="aodvideo_' + windowviewid + '" onload="MyAODvideoOnLoad(event)"></iframe>'+
  379 + '<iframe name="aodFrame" src="" style="width: 100%;height:100%" id="aodvideo_' + windowviewid + '" onload="MyAODvideoOnLoad(event)" allow="autoplay" allowfullscreen></iframe>'+
380 380 '</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>',
381 381 title: tittle,
382 382 position: {
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
  View file @8316d5e
... ... @@ -964,15 +964,15 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
964 964 $scope.jsPanelHeight = 510;
965 965  
966 966 $scope.jsPanelLeft = $scope.caOpenInOtherModules.position.x;
967   - if ($scope.caOpenInOtherModules.position.x < 1)
968   - $scope.jsPanelLeft = 1;
  967 + if ($scope.caOpenInOtherModules.position.x <= 1)
  968 + $scope.jsPanelLeft = 0;
969 969 $scope.jsPanelTop = $scope.caOpenInOtherModules.position.y;
970 970 if ($scope.caOpenInOtherModules.position.y < 30)
971 971 $scope.jsPanelTop = 30;
972 972  
973 973 if($location.url()!= "/curriculum-builder-detail") {
974   - $scope.jsPanelLeft = 10;
975   - $scope.jsPanelTop = 90;
  974 + $scope.jsPanelLeft = 1;
  975 + $scope.jsPanelTop = 85;
976 976 }
977 977 }
978 978  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
  View file @8316d5e
... ... @@ -947,15 +947,15 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
947 947 $scope.jsPanelHeight = 540;
948 948  
949 949 $scope.jsPanelLeft = $scope.ciOpenInOtherModules.position.x;
950   - if ($scope.ciOpenInOtherModules.position.x < 1)
951   - $scope.jsPanelLeft = 1;
  950 + if ($scope.ciOpenInOtherModules.position.x <= 1)
  951 + $scope.jsPanelLeft = 0;
952 952 $scope.jsPanelTop = $scope.ciOpenInOtherModules.position.y;
953 953 if ($scope.ciOpenInOtherModules.position.y < 30)
954 954 $scope.jsPanelTop = 30;
955 955  
956 956 if($location.url()!= "/curriculum-builder-detail") {
957   - $scope.jsPanelLeft = 10;
958   - $scope.jsPanelTop = 90;
  957 + $scope.jsPanelLeft = 1;
  958 + $scope.jsPanelTop = 85;
959 959 }
960 960  
961 961 }
... ... @@ -1133,12 +1133,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
1133 1133 canvasPaint.width = screen.width-40;
1134 1134 canvas.height = screen.height-400;
1135 1135 canvasPaint.height = screen.height-400;
1136   -
1137   - if($location.url()== "/curriculum-builder-detail") {
1138   - canvas.width = screen.width-370;
1139   - canvasPaint.width = screen.width-370;
1140   - }
1141   -
1142 1136 }
1143 1137 if(screen.height<400)
1144 1138 {
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
  View file @8316d5e
... ... @@ -32,13 +32,13 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
32 32  
33 33 var $ua = navigator.userAgent;
34 34 if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
35   - $("#treecontent").css('height',screen.height-140);
36   - $("#cbdivarea").css('height',screen.height-70);
  35 + $("#treecontent").css('height',screen.height-130);
  36 + $("#cbdivarea").css('height',screen.height-60);
37 37 }
38 38 else
39 39 {
40   - $("#treecontent").css('height',screen.height-280);
41   - $("#cbdivarea").css('height',screen.height-210);
  40 + $("#treecontent").css('height',screen.height-270);
  41 + $("#cbdivarea").css('height',screen.height-200);
42 42 }
43 43  
44 44 $('#sidebar-wrapper').unbind('click');
... ... @@ -722,9 +722,10 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
722 722 title: $rootScope.cbTreeFirstLabel,
723 723  
724 724 position: {
725   - top: 1,
726   - left:1,
  725 + top: 0,
  726 + left:0,
727 727 },
  728 + draggable: "disabled",
728 729 controls: { buttons: 'closeonly' },
729 730 size: { width: 820, height: 450 },
730 731  
... ... @@ -736,7 +737,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
736 737 $("#CBTextArea_ifr").css("display", "block");
737 738 });
738 739  
739   - $('#CBTinyMCEPanel').draggable({ containment: '#cbdivarea', scroll: false });
  740 + // $('#CBTinyMCEPanel').draggable({ containment: '#cbdivarea', scroll: false });
740 741  
741 742 }, 200);
742 743  
... ... @@ -2380,6 +2381,38 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
2380 2381 $("#modal-CurBuilder").draggable();
2381 2382 });
2382 2383  
  2384 + $rootScope.cbTreeToggleClick = function () {
  2385 + setTimeout(function(){
  2386 + // reset minimize panel while tree toggle click
  2387 +
  2388 + if($('div.CBLeft-Sidebar').hasClass('active'))
  2389 + {
  2390 + $('#jsPanel-min-container').css('left','15px');
  2391 + }
  2392 + else
  2393 + {
  2394 + $('#jsPanel-min-container').css('left','300px');
  2395 + }
  2396 +
  2397 + var modulePanel = $("div[id*='ImagePanel']");
  2398 + if (modulePanel != undefined && modulePanel != null) {
  2399 + if (modulePanel.length > 0) {
  2400 + for (var i = 0 ; i < modulePanel.length; i++) {
  2401 + var paneld = modulePanel[i].id;
  2402 + var containmentTop = $("#cbdivarea").position().top+10;
  2403 + var containmentLeft = $("#cbdivarea").position().left;
  2404 + //overrride containment of module on curriculum builder
  2405 + $('#'+paneld).draggable(
  2406 + {
  2407 + containment : [containmentLeft,containmentTop,5000,4000]//[left,top,right,bottom]
  2408 + });
  2409 + }
  2410 + }
  2411 + }
  2412 +
  2413 + },200)
  2414 +
  2415 + }
2383 2416  
2384 2417 $scope.loadContentOfSelectedSlide = function (id) {
2385 2418 $('#errorMessage').text("");
... ... @@ -2539,7 +2572,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
2539 2572 else {
2540 2573 //Added Code by sandeep for user story-52696
2541 2574 $("#viwerSelect").empty();
2542   - var modulePanel = $("#HomeContainerDiv").find("div[id*='ImagePanel']");
  2575 + var modulePanel = $("div[id*='ImagePanel']");
2543 2576 if (modulePanel != undefined && modulePanel != null) {
2544 2577 //Added code by sandeep for fixed Bug-58066
2545 2578 if (modulePanel.length > 0) {
... ... @@ -2553,7 +2586,13 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
2553 2586 var paneld = modulePanel[i].id;
2554 2587 var panelTitle = document.getElementById(paneld).childNodes[0].innerText;
2555 2588 $('#viwerSelect').append('<option value="' + paneld + '">' + panelTitle + '</option>');
2556   - $('#'+paneld).draggable({ containment: '#cbdivarea', scroll: false });
  2589 + var containmentTop = $("#cbdivarea").position().top+10;
  2590 + var containmentLeft = $("#cbdivarea").position().left;
  2591 + //overrride containment of module on curriculum builder
  2592 + $('#'+paneld).draggable(
  2593 + {
  2594 + containment : [containmentLeft,containmentTop,5000,4000]//[left,top,right,bottom]
  2595 + });
2557 2596 }
2558 2597  
2559 2598 $scope.CBEnableUI();
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @8316d5e
... ... @@ -936,15 +936,15 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
936 936 $scope.jsPanelHeight = 450;
937 937  
938 938 $scope.jsPanelLeft = $scope.daOpenInOtherModules.position.x;
939   - if ($scope.daOpenInOtherModules.position.x < 1)
940   - $scope.jsPanelLeft = 1;
  939 + if ($scope.daOpenInOtherModules.position.x <= 1)
  940 + $scope.jsPanelLeft = 0;
941 941 $scope.jsPanelTop = $scope.daOpenInOtherModules.position.y;
942 942 if ($scope.daOpenInOtherModules.position.y < 30)
943 943 $scope.jsPanelTop = 30;
944 944  
945 945 if($location.url()!= "/curriculum-builder-detail") {
946   - $scope.jsPanelLeft = 10;
947   - $scope.jsPanelTop = 90;
  946 + $scope.jsPanelLeft = 1;
  947 + $scope.jsPanelTop = 85;
948 948 }
949 949 }
950 950  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @8316d5e
... ... @@ -2327,6 +2327,10 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
2327 2327 };
2328 2328  
2329 2329 $rootScope.AllPanelStoreObject.push(windata);
  2330 + $(".jsPanel").draggable({
  2331 + containment : [0,55,5000,4000]//[left,top,right,bottom]
  2332 + });
  2333 +
2330 2334 }
2331 2335  
2332 2336 $rootScope.orientationchangeToMax=function(windowviewid)
... ... @@ -2358,8 +2362,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
2358 2362 if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
2359 2363 $('#arragePannel .dropdown-content').css("display","block");
2360 2364 }
2361   -
2362   -
  2365 +
2363 2366 $(window).unbind('resize');
2364 2367 window.addEventListener("resize", orientationchange);
2365 2368 function orientationchange() {
... ... @@ -2369,7 +2372,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
2369 2372 if (moduleImagePanel.length > 0) {
2370 2373  
2371 2374 for (var j = 0; j < moduleImagePanel.length; j++) {
2372   - var paneld=moduleImagePanel[j].id;
  2375 + var paneld=moduleImagePanel[j].id;
2373 2376 var len = (paneld).split("_").length;
2374 2377 var MultiWinId = (paneld).split("_")[len - 1];
2375 2378  
... ... @@ -2686,16 +2689,15 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
2686 2689 var resetWidth=0;
2687 2690 if($location.url()== "/curriculum-builder-detail") {
2688 2691 pTop = 30;
2689   - pLeft = 1;
  2692 + pLeft = 0;
2690 2693 }
2691 2694 var moduleImagePanel = $("div[id*='ImagePanel']");
2692 2695  
2693 2696 if (moduleImagePanel.length > 0) {
2694 2697 var resetWidth=($(window).innerWidth()-30)/2;
2695 2698  
2696   - for (var j = 0; j < moduleImagePanel.length; j++) {
2697   - var paneld=moduleImagePanel[j].id;
2698   -
  2699 + for (var j = 0; j < moduleImagePanel.length; j++) {
  2700 + var paneld=moduleImagePanel[j].id;
2699 2701 var len = (paneld).split("_").length;
2700 2702 var MultiWinId = (paneld).split("_")[len - 1];
2701 2703 $rootScope.orientationchangeToNormal(MultiWinId);
... ... @@ -2708,6 +2710,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
2708 2710 $("#"+paneld).css('top',pTop);
2709 2711 $("#"+paneld).css('left',pLeft);
2710 2712  
  2713 + $("#"+paneld+" .jsPanel-hdr .jsPanel-title").css('width','300px');
2711 2714 $("#"+paneld).css('width',resetWidth);
2712 2715 $("#"+paneld+' .jsPanel-content').css('width',resetWidth);
2713 2716 $("#"+paneld).css('z-index',j+1000);
... ... @@ -2727,7 +2730,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
2727 2730 var countreset=0;
2728 2731 if($location.url()== "/curriculum-builder-detail") {
2729 2732 pTop = 30;
2730   - pLeft = 1;
  2733 + pLeft = 0;
2731 2734 }
2732 2735 var countnumber=0;
2733 2736 var moduleImagePanel = $("div[id*='ImagePanel']");
... ... @@ -2737,10 +2740,17 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
2737 2740 if(moduleImagePanel.length<=2)
2738 2741 {
2739 2742 resetWidth=($(window).innerWidth()-30)/2;
  2743 + if($location.url()== "/curriculum-builder-detail") {
  2744 + resetWidth=($(window).innerWidth()-60)/2;
  2745 + }
  2746 +
2740 2747 }
2741 2748 else if(moduleImagePanel.length>=3)
2742 2749 {
2743 2750 resetWidth=($(window).innerWidth()-30)/3;
  2751 + if($location.url()== "/curriculum-builder-detail") {
  2752 + resetWidth=($(window).innerWidth()-65)/3;
  2753 + }
2744 2754 }
2745 2755  
2746 2756 for (var j = 0; j < moduleImagePanel.length; j++) {
... ... @@ -2754,21 +2764,22 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
2754 2764 //set max tiles 3 on screen width
2755 2765 if(countnumber>1 && countnumber<4)
2756 2766 {
2757   - pLeft = pLeft+resetWidth+10;
  2767 + pLeft = pLeft+resetWidth+5;
2758 2768 }
2759 2769 else if(countnumber>=4)
2760 2770 {
2761 2771 countreset=countreset+1;
2762 2772 countnumber=1;
2763   - pTop = 55+10+countreset*520;
  2773 + pTop = 55+5+countreset*520;
2764 2774 pLeft = 1;
2765 2775 if($location.url()== "/curriculum-builder-detail") {
2766   - pTop = 35+10+countreset*520;
  2776 + pTop = 35+5+countreset*520;
2767 2777 pLeft = 1;
2768 2778 }
2769 2779  
2770 2780 }
2771 2781  
  2782 + $("#"+paneld+" .jsPanel-hdr .jsPanel-title").css('width','300px');// remove extra tile width
2772 2783 $("#"+paneld).css('width',resetWidth);
2773 2784 $("#"+paneld+' .jsPanel-content').css('width',resetWidth);
2774 2785  
... ... @@ -9015,7 +9026,10 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
9015 9026 else if (canvas.id.match("canvasDivPIC")) {
9016 9027 var curModule = 'MY_PICTURES';
9017 9028 }
9018   -
  9029 +
  9030 + $(".jsPanel").draggable({
  9031 + containment : [0,55,5000,4000]//[left,top,right,bottom]
  9032 + });
9019 9033 // var curPosture = $rootScope.getLocalStorageValue('currentViewTitle');
9020 9034 var curPosture = panelTitle;
9021 9035  
... ... @@ -9358,7 +9372,14 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
9358 9372 sessionStorage.removeItem('isModuleOpenByOpenResource');
9359 9373 $("#jsPanel-min-container").removeAttr("style");
9360 9374 if (document.location.pathname == "/curriculum-builder-detail") {
9361   - $("#jsPanel-min-container").css( 'left', '300px' );
  9375 + if($('div.CBLeft-Sidebar').hasClass('active'))
  9376 + {
  9377 + $('#jsPanel-min-container').css('left','15px');
  9378 + }
  9379 + else
  9380 + {
  9381 + $('#jsPanel-min-container').css('left','300px');
  9382 + }
9362 9383 }
9363 9384 });
9364 9385  
... ... @@ -9792,7 +9813,14 @@ function AIAModuleOpenResourceInfo(windowData) {
9792 9813 var scope = angular.element(document.querySelector('[ng-controller="HomeController"]')).scope();
9793 9814 scope.$apply(function () {
9794 9815 if (document.location.pathname == "/curriculum-builder-detail") {
9795   - $("#jsPanel-min-container").css( 'left', '300px' );
  9816 + if($('div.CBLeft-Sidebar').hasClass('active'))
  9817 + {
  9818 + $('#jsPanel-min-container').css('left','15px');
  9819 + }
  9820 + else
  9821 + {
  9822 + $('#jsPanel-min-container').css('left','300px');
  9823 + }
9796 9824 }
9797 9825 scope.AIAModuleOpenResourceInfo(windowData);
9798 9826 });
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
  View file @8316d5e
... ... @@ -366,15 +366,15 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
366 366 $scope.jsPanelHeight = 450;
367 367  
368 368 $scope.jsPanelLeft = $scope.leOpenInOtherModules.position.x;
369   - if ($scope.leOpenInOtherModules.position.x < 1)
370   - $scope.jsPanelLeft = 1;
  369 + if ($scope.leOpenInOtherModules.position.x <= 1)
  370 + $scope.jsPanelLeft = 0;
371 371 $scope.jsPanelTop = $scope.leOpenInOtherModules.position.y;
372 372 if ($scope.leOpenInOtherModules.position.y < 30)
373 373 $scope.jsPanelTop = 30;
374 374  
375 375 if($location.url()!= "/curriculum-builder-detail") {
376   - $scope.jsPanelLeft = 10;
377   - $scope.jsPanelTop = 90;
  376 + $scope.jsPanelLeft = 1;
  377 + $scope.jsPanelTop = 85;
378 378 }
379 379  
380 380 }
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/MyAnimationController.js
  View file @8316d5e
... ... @@ -275,15 +275,15 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
275 275 $scope.jsPanelHeight = 400;
276 276  
277 277 $scope.jsPanelLeft = $scope.VidOpenInOtherModules.position.x;
278   - if ($scope.VidOpenInOtherModules.position.x < 1)
279   - $scope.jsPanelLeft = 1;
  278 + if ($scope.VidOpenInOtherModules.position.x <= 1)
  279 + $scope.jsPanelLeft = 0;
280 280 $scope.jsPanelTop = $scope.VidOpenInOtherModules.position.y;
281 281 if ($scope.VidOpenInOtherModules.position.y < 30)
282 282 $scope.jsPanelTop = 30;
283 283  
284 284 if($location.url()!= "/curriculum-builder-detail") {
285   - $scope.jsPanelLeft = 10;
286   - $scope.jsPanelTop = 90;
  285 + $scope.jsPanelLeft = 1;
  286 + $scope.jsPanelTop = 85;
287 287 }
288 288  
289 289 if (animationSource.length > 0 ) {
... ... @@ -300,8 +300,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
300 300 ' nonad="' + animationSource + '"' +
301 301 ' nonhd="' + animationSource + '">' +
302 302 ' <source type="video/mp4" src="' + animationSource + '">' +
303   - '<object width="640" height="400"' +
304   - ' type="application/x-shockwave-flash" data="//vjs.zencdn.net/3.2/video-js.swf"><param name="allowfullscreen" value="true">' +
  303 + '<object width="640" height="400" type="application/x-shockwave-flash" data="//vjs.zencdn.net/3.2/video-js.swf">'+
  304 + '<param name="allowfullscreen" value="true">' +
305 305 ' <param name="allowscriptaccess" value="always"><param name="movie" value="//vjs.zencdn.net/3.2/video-js.swf">' +
306 306 ' <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>',
307 307  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/MyPictureController.js
  View file @8316d5e
... ... @@ -265,15 +265,15 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
265 265 $scope.jsPanelHeight = 540;
266 266  
267 267 $scope.jsPanelLeft = $scope.picOpenInOtherModules.position.x;
268   - if ($scope.picOpenInOtherModules.position.x < 1)
269   - $scope.jsPanelLeft = 1;
  268 + if ($scope.picOpenInOtherModules.position.x <= 1)
  269 + $scope.jsPanelLeft = 0;
270 270 $scope.jsPanelTop = $scope.picOpenInOtherModules.position.y;
271 271 if ($scope.picOpenInOtherModules.position.y < 30)
272 272 $scope.jsPanelTop = 30;
273 273  
274 274 if($location.url()!= "/curriculum-builder-detail") {
275   - $scope.jsPanelLeft = 10;
276   - $scope.jsPanelTop = 90;
  275 + $scope.jsPanelLeft = 1;
  276 + $scope.jsPanelTop = 85;
277 277 }
278 278  
279 279 $scope.jsPanelPIC = $.jsPanel({
... ... @@ -415,12 +415,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
415 415 canvasPaint.height = screen.height-280;
416 416 canvas.width = screen.width-40;
417 417 canvasPaint.width = screen.width-40;
418   - if($location.url()== "/curriculum-builder-detail") {
419   - canvas.height = screen.height-300;
420   - canvasPaint.height = screen.height-300;
421   - canvas.width = screen.width-370;
422   - canvasPaint.width = screen.width-370;
423   - }
424 418  
425 419 }
426 420  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
  View file @8316d5e
... ... @@ -609,15 +609,15 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
609 609 $scope.jsPanelHeight = 420;
610 610  
611 611 $scope.jsPanelLeft = $scope.aaOpenInOtherModules.position.x;
612   - if ($scope.aaOpenInOtherModules.position.x < 1)
613   - $scope.jsPanelLeft = 1;
  612 + if ($scope.aaOpenInOtherModules.position.x <= 1)
  613 + $scope.jsPanelLeft = 0;
614 614 $scope.jsPanelTop = $scope.aaOpenInOtherModules.position.y;
615 615 if ($scope.aaOpenInOtherModules.position.y < 30)
616 616 $scope.jsPanelTop = 30;
617 617  
618 618 if($location.url()!= "/curriculum-builder-detail") {
619   - $scope.jsPanelLeft = 10;
620   - $scope.jsPanelTop = 90;
  619 + $scope.jsPanelLeft = 1;
  620 + $scope.jsPanelTop = 85;
621 621 }
622 622  
623 623 }
... ...
400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
  View file @8316d5e
... ... @@ -308,7 +308,7 @@ AIA.constant(&#39;Modules&#39;, [
308 308 Name: 'The Wellness Tools',
309 309 },
310 310 {
311   - Id: 1017, // Updated from 17 to 1017 to match with database Id
  311 + Id: 17,
312 312 Name: 'A.D.A.M. OnDemand',
313 313 },
314 314  
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/CBuild/curriculum-builder-detail.html
  View file @8316d5e
... ... @@ -12,7 +12,7 @@
12 12 width: 300px;
13 13 padding-top: 0px;
14 14 background: #222;
15   - padding-top: 20px;
  15 + padding-top: 10px;
16 16 position: absolute !important;
17 17 left: 0;
18 18 }
... ... @@ -51,7 +51,7 @@
51 51 <div ng-include="aap/widget/MainMenu.html"></div>
52 52 <div class=" " id="CBDetailPageDiv" ng-controller="CurrBuildController">
53 53 <div class="pos-relative leftToolBar CBLeft-Sidebar pull-left">
54   - <div class="toggle-icon toggleBar toggleHeadingButton" title="Show/Hide Sidebar" style="top:20px;left:285px"></div>
  54 + <div class="toggle-icon toggleBar toggleHeadingButton" title="Show/Hide Sidebar" style="top:20px;left:285px" onclick="cbTreeToggleClick()"></div>
55 55 <div class="col-xs-12">
56 56 <div id="sidebar-wrapper" class="sidebar-lft">
57 57 <div class="row">
... ... @@ -114,7 +114,7 @@
114 114 </div>
115 115  
116 116 <div class="CB-JS-Panel">
117   - <div id="cbdivarea" class="col-sm-12 stickey-area" style="overflow:scroll;margin-top:20px;background-color: #afacac;">
  117 + <div id="cbdivarea" class="col-sm-12 stickey-area" style="overflow:scroll;margin-top:10px;background-color: #afacac;">
118 118 <div ng-init="openCBJsPanel()" id="CBPanelDiv" class="CBBodyView"></div>
119 119 <div id="cbparentcustomDiv"></div>
120 120 <div id="cbModelDeleteBackground"></div>
... ... @@ -373,6 +373,10 @@
373 373 });
374 374 });
375 375  
  376 + function cbTreeToggleClick() {
  377 + angular.element(document.querySelector('[ng-controller="CurrBuildController"]')).scope().cbTreeToggleClick();
  378 + }
  379 +
376 380 </script>
377 381 <script>
378 382 function removeSpaces(string)
... ...
400-SOURCECODE/AIAHTML5.Web/libs/jquery/jquery_plugin/jsPanel/jspanel/jquery.jspanel.js
  View file @8316d5e
... ... @@ -859,11 +859,11 @@ var jsPanel = {
859 859 var currentController = panel.option.currentController;
860 860 if (pathname == "/curriculum-builder-detail")
861 861 {
862   - var ht=$("#cbdivarea").height()-55;
  862 + var ht=$("#cbdivarea").height()-15;
863 863 var wt= $("#cbdivarea").width()+8;
864 864 panel.css({
865   - top: parseInt(30),
866   - left:parseInt(1),
  865 + top:0,// parseInt(30),
  866 + left:0,//parseInt(1),
867 867 width: wt,
868 868 height:ht,
869 869 });
... ... @@ -988,7 +988,17 @@ var jsPanel = {
988 988 var pathname = window.location.pathname;
989 989 if (pathname == "/curriculum-builder-detail")
990 990 {
991   - $('body').append('<div id="jsPanel-min-container" style="left:300px"></div>');
  991 + // reset minimize panel while tree toggle click
  992 +
  993 + if($('div.CBLeft-Sidebar').hasClass('active'))
  994 + {
  995 + $('body').append('<div id="jsPanel-min-container" style="left:15px"></div>');
  996 + }
  997 + else
  998 + {
  999 + $('body').append('<div id="jsPanel-min-container" style="left:300px"></div>');
  1000 + }
  1001 +
992 1002 }
993 1003 else
994 1004 {
... ...