ADAM / AIAHTML5

Commit 3ff03a2b2c9c4d4d18f01efd6181bb9a45cd8866

Authored by Amrita Vishnoi
2 parents d88fa2c9 33ad4c1b

Merge branch 'AODExternalLinkFix' into Develop

Inline Side-by-side
Showing 2 changed files with 105 additions and 105 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js
  View file @3ff03a2
1 -'use strict';  
2 -  
3 -AIA.controller("LinkController", ["$scope", "$rootScope","$log", "pages", "$routeParams",  
4 -function ($scope, $rootScope, log, pages, $routeParams) {  
5 -  
6 - //$rootScope.currentActiveModuleTitle = Modules[10].Name;  
7 - //$rootScope.currentActiveModuleTitle = $routeParams.modname;  
8 - $scope.links = [  
9 - new link("encyclopedia", "Encyclopedia", 'https://ssl.adam.com/content.aspx?site=aia5se3.adam.com&login=AIA41842&productId=117', "100%", "750px"),  
10 - new link("IP-10", "IP 10", "http://interactiveanatomy.com/IPWeb10/index.aspx", "100%", "750px"),  
11 - new link("indepth-reports", "InDepth Reports", "https://ssl.adam.com/content.aspx?site=aia5se3.adam.com&login=AIA41842&productId=10", "100%", "4000px"),  
12 - 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"),  
13 - new link("bodyguide", "Body Guide", "https://ssl.adam.com/content.aspx?site=aia5se3.adam.com&login=AIA41842&productId=25 ", "100%", "1050px"),  
14 - new link("health-navigator", "Health Navigator", "https://ssl.adam.com/content.aspx?site=aia5se3.adam.com&login=AIA41842&productId=65 ", "100%", "1000px"),  
15 - new link("wellness-tools", "The Wellness Tools", "https://ssl.adam.com/content.aspx?site=aia5se3.adam.com&login=AIA41842&productId=20 ", "100%", "1500px"),  
16 - new link("aod", "A.D.A.M OnDemand", "http://uat.adamondemand.com/Home/AIACatalog?categoriesID=2", "100%", "1500px")  
17 - ];  
18 -  
19 - $scope.$on('$viewContentLoaded', function (event) {  
20 - // code that will be executed ...  
21 - // every time this view is loaded  
22 -  
23 -  
24 - for (var i = 0; i < $scope.links.length; i++) {  
25 - if ($scope.links[i].modname == $routeParams.modname) {  
26 - $rootScope.currentActiveModuleTitle = $scope.links[i].title;  
27 - if ($rootScope.currentActiveModuleTitle == "IP 10") 1 +'use strict';
  2 +
  3 +AIA.controller("LinkController", ["$scope", "$rootScope","$log", "pages", "$routeParams",
  4 +function ($scope, $rootScope, log, pages, $routeParams) {
  5 +
  6 + //$rootScope.currentActiveModuleTitle = Modules[10].Name;
  7 + //$rootScope.currentActiveModuleTitle = $routeParams.modname;
  8 + $scope.links = [
  9 + new link("encyclopedia", "Encyclopedia", 'https://ssl.adam.com/content.aspx?site=aia5se3.adam.com&login=AIA41842&productId=117', "100%", "750px"),
  10 + new link("IP-10", "IP 10", "http://interactiveanatomy.com/IPWeb10/index.aspx", "100%", "750px"),
  11 + new link("indepth-reports", "InDepth Reports", "https://ssl.adam.com/content.aspx?site=aia5se3.adam.com&login=AIA41842&productId=10", "100%", "4000px"),
  12 + 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"),
  13 + new link("bodyguide", "Body Guide", "https://ssl.adam.com/content.aspx?site=aia5se3.adam.com&login=AIA41842&productId=25 ", "100%", "1050px"),
  14 + new link("health-navigator", "Health Navigator", "https://ssl.adam.com/content.aspx?site=aia5se3.adam.com&login=AIA41842&productId=65 ", "100%", "1000px"),
  15 + new link("wellness-tools", "The Wellness Tools", "https://ssl.adam.com/content.aspx?site=aia5se3.adam.com&login=AIA41842&productId=20 ", "100%", "1500px"),
  16 + new link("aod", "A.D.A.M OnDemand", "http://uat.adamondemand.com/Home/AIACatalog?categoriesID=2", "100%", "1500px")
  17 + ];
  18 +
  19 + $scope.$on('$viewContentLoaded', function (event) {
  20 + // code that will be executed ...
  21 + // every time this view is loaded
  22 +
  23 +
  24 + for (var i = 0; i < $scope.links.length; i++) {
  25 + if ($scope.links[i].modname == $routeParams.modname) {
  26 + $rootScope.currentActiveModuleTitle = $scope.links[i].title;
  27 + if ($rootScope.currentActiveModuleTitle == "IP 10" || $rootScope.currentActiveModuleTitle == "A.D.A.M OnDemand")
28 { 28 {
29 document.getElementById('externalLink').style.height = "1024px"; 29 document.getElementById('externalLink').style.height = "1024px";
30 30
31 - }  
32 - $scope.objdata = $scope.links[i].objurl;  
33 - $scope.myObj = $scope.links[i].objstyle;  
34 - }  
35 - }  
36 - });  
37 -  
38 - $scope.showTabButton = false;  
39 - $scope.IsVisible = function () {  
40 - $scope.scroll();  
41 -  
42 - }  
43 -  
44 - $scope.scroll = function () {  
45 - // $window.scrollTo(0, 0);  
46 - $("html,body").scrollTop(0);  
47 - //alert("scroll");  
48 - }  
49 -}]  
50 -  
51 -  
52 -);  
53 -  
54 - 31 + }
  32 + $scope.objdata = $scope.links[i].objurl;
  33 + $scope.myObj = $scope.links[i].objstyle;
  34 + }
  35 + }
  36 + });
  37 +
  38 + $scope.showTabButton = false;
  39 + $scope.IsVisible = function () {
  40 + $scope.scroll();
  41 +
  42 + }
  43 +
  44 + $scope.scroll = function () {
  45 + // $window.scrollTo(0, 0);
  46 + $("html,body").scrollTop(0);
  47 + //alert("scroll");
  48 + }
  49 +}]
  50 +
  51 +
  52 +);
  53 +
  54 +
400-SOURCECODE/AIAHTML5.Web/content/css/print-main.css
  View file @3ff03a2
1 -  
2 -.print-box{padding: 10px 0;}  
3 -.print-paper{ background: #fff; padding: 20px 10px; border: 1px solid #ccc; overflow: auto;}  
4 -  
5 -.portrait-box { width: 451px; height: 571px; border: 2px solid #000; border-radius: 5px; padding: 10px; position:relative;} /*width: 600px; height: 1000px; width: 624px; height: 768px;*/  
6 -.landscape-box { width: 571px; height: 451px; border: 2px solid #000; border-radius: 5px; padding: 10px; position: relative;} /*width: 1000px; height: 600px; width: 768px; height: 624px;*/  
7 -  
8 -#dvLandscape, #dvPortrait {  
9 - border-radius: 5px;  
10 - padding: 0px !important;  
11 -}  
12 -  
13 - #dvPortrait { margin-top:42%;}  
14 -  
15 -.pp-col-sm-4 .print-col-sm-4{  
16 - padding-left: 0px !important;  
17 - padding-right: 0px !important;  
18 -}  
19 -  
20 -.pp-marginTop10 .print-marginTop10 {  
21 - margin-top: 0px;  
22 -}  
23 -  
24 -#imgPortrait, #imgLandscape {  
25 - padding: 10px;  
26 -}  
27 -  
28 -@media (min-width: 768px) {  
29 - .print-footer-port div, .print-footer-land div {  
30 - width: 50%;  
31 - }  
32 -}  
33 -#minSpan {  
34 - margin-top: 6px;  
35 -}  
36 -  
37 -.bgnone img{ background: none;}  
38 -.scan-scenario{ position: absolute; top: 30px; right: 30px}  
39 -.pp-main-full {  
40 - margin-top: 10px;  
41 -}  
42 -.pp-form-control {  
43 - border-right: 0;  
44 - box-shadow: 0 0 0;  
45 - border-color: #ccc;  
46 - width: 100%;  
47 - float: right;  
48 -}  
49 -.font12{ font-size:12px;}  
50 -.marginbtm10{ margin-bottom:10px;}  
51 -.width-auto {  
52 - width: auto;  
53 -}  
54 - 1 +
  2 +.print-box{padding: 10px 0;}
  3 +.print-paper{ background: #fff; padding: 20px 10px; border: 1px solid #ccc; overflow: auto;}
  4 +
  5 +.portrait-box { width: 451px; height: 571px; border: 2px solid #000; border-radius: 5px; padding: 10px; position:relative;} /*width: 600px; height: 1000px; width: 624px; height: 768px;*/
  6 +.landscape-box { width: 571px; height: 451px; border: 2px solid #000; border-radius: 5px; padding: 10px; position: relative;} /*width: 1000px; height: 600px; width: 768px; height: 624px;*/
  7 +
  8 +#dvLandscape, #dvPortrait {
  9 + border-radius: 5px;
  10 + padding: 0px !important;
  11 +}
  12 +
  13 + #dvPortrait { margin-top:42%;}
  14 +
  15 +.pp-col-sm-4 .print-col-sm-4{
  16 + padding-left: 0px !important;
  17 + padding-right: 0px !important;
  18 +}
  19 +
  20 +.pp-marginTop10 .print-marginTop10 {
  21 + margin-top: 0px;
  22 +}
  23 +
  24 +#imgPortrait, #imgLandscape {
  25 + padding: 10px;
  26 +}
  27 +
  28 +@media (min-width: 768px) {
  29 + .print-footer-port div, .print-footer-land div {
  30 + width: 50%;
  31 + }
  32 +}
  33 +#minSpan {
  34 + margin-top: 6px;
  35 +}
  36 +
  37 +.bgnone img{ background: none;}
  38 +.scan-scenario{ position: absolute; top: 30px; right: 30px}
  39 +.pp-main-full {
  40 + margin-top: 10px;
  41 +}
  42 +.pp-form-control {
  43 + border-right: 0;
  44 + box-shadow: 0 0 0;
  45 + border-color: #ccc;
  46 + width: 100%;
  47 + float: right;
  48 +}
  49 +.font12{ font-size:12px;}
  50 +.marginbtm10{ margin-bottom:10px;}
  51 +.width-auto {
  52 + width: auto;
  53 +}
  54 +
55 55
56 .externalFrame { 56 .externalFrame {
57 width:100%; 57 width:100%;