diff --git a/400-SOURCECODE/AIAHTML5.Web/Web.config b/400-SOURCECODE/AIAHTML5.Web/Web.config index 1061ffa..385bad9 100644 --- a/400-SOURCECODE/AIAHTML5.Web/Web.config +++ b/400-SOURCECODE/AIAHTML5.Web/Web.config @@ -39,7 +39,9 @@ + + diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js index 6e087c9..53dfacd 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js @@ -119,32 +119,41 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A $rootScope.isOpenResourceBtnClicked = false; $rootScope.multiViewInfo = []; $rootScope.openResource = function () { - $rootScope.isOpenResourceBtnClicked = true; - $rootScope.isTermClicked = false; + // $rootScope.isOpenResourceBtnClicked = true; + // $rootScope.isTermClicked = false; //switch ($location.url()) { // case '/curriculum-builder-detail': // $location.url('/curriculum-builder'); // break; //} - $('#dvPrintPreview').css('display', 'block'); + $('#dvOpenResoucePanel').css('display', 'block'); + + // var homepath = $location.protocol() + "//" + $location.host() + ":" + $location.port() + "/"; + var homepath = $rootScope.homeURL; + $("#CBDetailPageDiv").css({ "display": "none", "pointer-events": "none", "opacity": ".5" }); + $(".navbar-fixed-top").css({"display": "none", "pointer-events": "none", "opacity": ".5" }); + $("#topMenuBar").css({ "display": "none", "pointer-events": "none", "opacity": ".5" }); + $.jsPanel({ id: 'OpenResourcePanel', - selector: '#dvPrintPreview', + selector: '#dvOpenResoucePanel', theme: 'success', currentController: 'HomeController', parentSlug: 'curriculum-builder-detail', content: '
' + - '', - title: tittle, + '', + title: "Open Module in Curriculum Builder", position: { - top: 70, + top: 1, left: 1 }, + controls: { buttons: 'closeonly' }, + draggable: "disabled", size: { - width: 900, + width: screen.width-10, height: 600 }, @@ -173,9 +182,9 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A } $scope.helpTopicLink = function () { - var absurl = $location.absUrl(); - var hTopicUrl = absurl + "content/help/index.html"; - var aboutADAM = absurl + "content/help/about/Adam_Credits_AIA5.html"; + $rootScope.homeURL = $location.absUrl(); + var hTopicUrl = $rootScope.homeURL + "content/help/index.html"; + var aboutADAM = $rootScope.homeURL + "content/help/about/Adam_Credits_AIA5.html"; $("#helplinkId").append("
  • Help Topics
  • "); $("#helplinkId").append("
  • Customer Support
  • "); @@ -6520,6 +6529,14 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A }); + $(document).on('click', '#OpenResourcePanel .jsglyph-remove', function () { + + $("#CBDetailPageDiv").css({ "display": "block", "pointer-events": "auto", "opacity": "1" }); + $(".navbar-fixed-top").css({ "display": "block", "pointer-events": "auto", "opacity": "1" }); + $("#topMenuBar").css({ "display": "block", "pointer-events": "auto", "opacity": "1" }); + + }); + $rootScope.restrictBodySystemList = function () { var RestrictListDiv = document.getElementById("restrictListDiv"); if (RestrictListDiv.style.display == 'block') { diff --git a/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html b/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html index 3a84c74..c885e1b 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html @@ -1,4 +1,4 @@ - - + + + +