diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index d53c7f6..98bbabe 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -1343,9 +1343,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l } //set scrollbars on canvas and hide loading label - // var isiOSSafari = (navigator.userAgent.match(/like Mac OS X/i)) ? true : false; - var isiOSSafari = (navigator.userAgent.match(/iPad/i)) ? true : false; - + //check the OS + var isiOSSafari = (navigator.userAgent.match(/(iPod|iPhone|iPad|android)/i)) ? true : false; + //set scrollbars on canvas and hide loading label $('#daLoaderLabel').css('visibility', 'hidden') @@ -9434,6 +9434,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l } $rootScope.refreshTermListOnSystemSelection = function (bodysystemId) { + $rootScope.isLoading = true; + $('#spinner').css('visibility', 'visible'); $rootScope.selectedBodySystemId = bodysystemId; $rootScope.selectedBodySystemName = $('#bodySystems option[id="' + bodysystemId + '"]').val(); $("#bodySystems").find("option").css({ "background-color": "#ffffff", "color": "#000000" }); @@ -9457,7 +9459,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l .where('_SystemNumber == ' + bodysystemId) .select(); if (systemMatchedTermList != null || systemMatchedTermList != undefined) { - + $rootScope.isLoading = false; + $('#spinner').css('visibility', 'hidden'); $scope.refreshTerms(systemMatchedTermList); } }, diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js index e4a3251..51c1aea 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js @@ -5227,13 +5227,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic } - $rootScope.OpenAdminForm = function (userInfo) { - $('#adminModal').css({ top: '50px' }); - if ($rootScope.userData) { - $('#adminfName').val($rootScope.userData.FirstName); - $('#adminlName').val($rootScope.userData.LastName); - $('#adminEmailId').val($rootScope.userData.EmailId); - } + $rootScope.reDirectURLToAdmin = function () { + window.location.href = "Admin-UI"; }; $rootScope.SendAdminAccessRequestMail = function (userInfo) { diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js index 909520c..0e7877a 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js @@ -1,60 +1,67 @@ -'use strict'; - -AIA.controller("LinkController", ["$scope", "$rootScope", "$log", "$location", "pages", "$routeParams", -function ($scope, $rootScope, log, $location, pages, $routeParams) { - - //$rootScope.currentActiveModuleTitle = Modules[10].Name; - //$rootScope.currentActiveModuleTitle = $routeParams.modname; - $scope.links = [ - new link("encyclopedia", "Encyclopedia", 'https://ssl.adam.com/content.aspx?site=aia5se3.adam.com&login=AIA41842&productId=117', "100%", "750px"), - new link("IP-10", "IP 10", "http://interactiveanatomy.com/IPWeb10/index.aspx", "100%", "750px"), - new link("indepth-reports", "InDepth Reports", "https://ssl.adam.com/content.aspx?site=aia5se3.adam.com&login=AIA41842&productId=10", "100%", "4000px"), - new link("complementary-and-alternate-medicine", "Complementary and Alternative Medicine", "https://ssl.adam.com/content.aspx?site=aia5se3.adam.com&login=AIA41842&productId=107", "100%", "750px"), - new link("bodyguide", "Body Guide", "https://ssl.adam.com/content.aspx?site=aia5se3.adam.com&login=AIA41842&productId=25 ", "100%", "1050px"), - new link("health-navigator", "Health Navigator", "https://ssl.adam.com/content.aspx?site=aia5se3.adam.com&login=AIA41842&productId=65 ", "100%", "1000px"), - new link("wellness-tools", "The Wellness Tools", "https://ssl.adam.com/content.aspx?site=aia5se3.adam.com&login=AIA41842&productId=20 ", "100%", "1500px"), - new link("aod", "A.D.A.M OnDemand", "http://uat.adamondemand.com/Home/AIACatalog?categoriesID=2", "100%", "1500px") - ]; - - $scope.$on('$viewContentLoaded', function (event) { - - - if ($rootScope.refreshcheck == null) { - $location.path('/'); - } - // code that will be executed ... - // every time this view is loaded - - - for (var i = 0; i < $scope.links.length; i++) { - if ($scope.links[i].modname == $routeParams.modname) { - $rootScope.currentActiveModuleTitle = $scope.links[i].title; - if ($rootScope.currentActiveModuleTitle == "IP 10" || $rootScope.currentActiveModuleTitle == "A.D.A.M OnDemand") - { - // document.getElementById('externalLink').style.height = "1024px"; - document.getElementById('externalLink').style.height = $(window).outerHeight() - 128+"px"; - - } - $scope.objdata = $scope.links[i].objurl; - $scope.myObj = $scope.links[i].objstyle; - } - } - }); - - $scope.showTabButton = false; - $scope.IsVisible = function () { - $scope.scroll(); - - } - - $scope.scroll = function () { - // $window.scrollTo(0, 0); - $("html,body").scrollTop(0); - //alert("scroll"); - } -}] - - -); - - +'use strict'; + +AIA.controller("LinkController", ["$scope", "$rootScope", "$log", "$location", "pages", "$routeParams", +function ($scope, $rootScope, log, $location, pages, $routeParams) { + + //$rootScope.currentActiveModuleTitle = Modules[10].Name; + //$rootScope.currentActiveModuleTitle = $routeParams.modname; + $scope.links = [ + new link("encyclopedia", "Encyclopedia", 'https://ssl.adam.com/content.aspx?site=aia5se3.adam.com&login=AIA41842&productId=117', "100%", "750px"), + new link("IP-10", "IP 10", "http://interactiveanatomy.com/IPWeb10/index.aspx", "100%", "750px"), + new link("indepth-reports", "InDepth Reports", "https://ssl.adam.com/content.aspx?site=aia5se3.adam.com&login=AIA41842&productId=10", "100%", "4000px"), + new link("complementary-and-alternate-medicine", "Complementary and Alternative Medicine", "https://ssl.adam.com/content.aspx?site=aia5se3.adam.com&login=AIA41842&productId=107", "100%", "750px"), + new link("bodyguide", "Body Guide", "https://ssl.adam.com/content.aspx?site=aia5se3.adam.com&login=AIA41842&productId=25 ", "100%", "1050px"), + new link("health-navigator", "Health Navigator", "https://ssl.adam.com/content.aspx?site=aia5se3.adam.com&login=AIA41842&productId=65 ", "100%", "1000px"), + new link("wellness-tools", "The Wellness Tools", "https://ssl.adam.com/content.aspx?site=aia5se3.adam.com&login=AIA41842&productId=20 ", "100%", "1500px"), + new link("aod", "A.D.A.M OnDemand", "http://uat.adamondemand.com/Home/AIACatalog?categoriesID=2", "100%", "1500px") + ]; + + $scope.$on('$viewContentLoaded', function (event) { + + + if ($rootScope.refreshcheck == null) { + $location.path('/'); + } + // code that will be executed ... + // every time this view is loaded + + var $uaAOD = navigator.userAgent; + for (var i = 0; i < $scope.links.length; i++) { + if ($scope.links[i].modname == $routeParams.modname) { + $rootScope.currentActiveModuleTitle = $scope.links[i].title; + if ($rootScope.currentActiveModuleTitle == "IP 10" || $rootScope.currentActiveModuleTitle == "A.D.A.M OnDemand") + { + // document.getElementById('externalLink').style.height = "1024px"; + if ($uaAOD.match(/(iPod|iPhone|iPad|android)/i)) { + document.getElementById('externalLink').style.height = 2048 + "px"; + } + else { + document.getElementById('externalLink').style.height = $(window).outerHeight() - 128 + "px"; + } + + + + } + $scope.objdata = $scope.links[i].objurl; + $scope.myObj = $scope.links[i].objstyle; + } + } + }); + + $scope.showTabButton = false; + $scope.IsVisible = function () { + $scope.scroll(); + + } + + $scope.scroll = function () { + // $window.scrollTo(0, 0); + $("html,body").scrollTop(0); + //alert("scroll"); + } +}] + + +); + + diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js index 2e8f15d..586018d 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js @@ -1395,6 +1395,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou $rootScope.refreshTermListOnAASystemSelection = function (bodySystemId) { $rootScope.bodySystemSeletedId = bodySystemId; + $("#AABodySystems").find("option").css({ "background-color": "#ffffff", "color": "#000000" }); + $("#AABodySystems").find("option[id=" + bodySystemId + "]").css({ "background-color": "#3399FF", "color": "#ffffff" }); $('#termList').empty(); var bodySystemName = $("#AABodySystems #" + bodySystemId).val(); if (bodySystemName == "All") { diff --git a/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html b/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html index a869b1b..e536f72 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html @@ -1,91 +1,92 @@ - - +