diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js index 801151f..85b15a2 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.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; } } diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/AIController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/AIController.js index 46e3c7a..b8acb19 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/AIController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/AIController.js @@ -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'); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/AODController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/AODController.js index 890dc66..3c4369f 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/AODController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/AODController.js @@ -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: '
' + - ''+ + ''+ '
', title: tittle, position: { diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js index b113c60..53b3288 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js @@ -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; } } diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js index 965cb9b..6632eb4 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js @@ -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) { diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js index 8bcde18..69abb95 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js @@ -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(''); - $('#'+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(); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 809b340..7b5db64 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -936,15 +936,15 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$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; } } diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js index 9f6ef9a..913b3f7 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js @@ -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); }); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js index 4f12526..dbda461 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js @@ -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; } } diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/MyAnimationController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/MyAnimationController.js index e529c2a..cd9fcda 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/MyAnimationController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/MyAnimationController.js @@ -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 + '">' + ' ' + - '' + + ''+ + '' + ' ' + ' Here we are', diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/MyPictureController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/MyPictureController.js index c923e04..4725651 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/MyPictureController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/MyPictureController.js @@ -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; - } } diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js index 13f455c..aeda0e5 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js @@ -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; } } diff --git a/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js b/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js index 3cb6324..ff91160 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js @@ -308,7 +308,7 @@ AIA.constant('Modules', [ Name: 'The Wellness Tools', }, { - Id: 1017, // Updated from 17 to 1017 to match with database Id + Id: 17, Name: 'A.D.A.M. OnDemand', }, diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/CBuild/curriculum-builder-detail.html b/400-SOURCECODE/AIAHTML5.Web/app/views/CBuild/curriculum-builder-detail.html index 3208917..09b636a 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/views/CBuild/curriculum-builder-detail.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/views/CBuild/curriculum-builder-detail.html @@ -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 @@
-
+