Commit 345056772d181bc0e77ad053c29ba09e22816717

Authored by Nikita Kulshreshtha
2 parents 4b30386f ca4916d6

Merge branch 'AODLink' into Develop

400-SOURCECODE/AIAHTML5.API/Web.config
@@ -39,7 +39,7 @@ @@ -39,7 +39,7 @@
39 <add key="EnableSSL" value="false" /> 39 <add key="EnableSSL" value="false" />
40 <add key="Site_Url" value ="//52.2.38.120"/> 40 <add key="Site_Url" value ="//52.2.38.120"/>
41 <add key ="HostAddress" value="10.100.12.13" /> 41 <add key ="HostAddress" value="10.100.12.13" />
42 - <add key="isUserAuthenticated" value="false"/> 42 + <add key="isUserAuthenticated" value="true"/>
43 </appSettings> 43 </appSettings>
44 <system.web> 44 <system.web>
45 <compilation debug="true" targetFramework="4.5" /> 45 <compilation debug="true" targetFramework="4.5" />
400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js
@@ -12,7 +12,8 @@ function ($scope, $rootScope, log, pages, $routeParams) { @@ -12,7 +12,8 @@ function ($scope, $rootScope, log, pages, $routeParams) {
12 new link("complementary-and-alternate-medicine", "Complementary and Alternative Medicine", "http://182.19.10.91:92/CAMHome.aspx", "100%", "750px"), 12 new link("complementary-and-alternate-medicine", "Complementary and Alternative Medicine", "http://182.19.10.91:92/CAMHome.aspx", "100%", "750px"),
13 new link("bodyguide", "Body Guide", "http://aia5.adam.com/content.aspx?productId=25", "100%", "1050px"), 13 new link("bodyguide", "Body Guide", "http://aia5.adam.com/content.aspx?productId=25", "100%", "1050px"),
14 new link("symptom-navigator", "Symptom Navigator", "http://aia5.adam.com/content.aspx?productId=44", "100%", "1000px"), 14 new link("symptom-navigator", "Symptom Navigator", "http://aia5.adam.com/content.aspx?productId=44", "100%", "1000px"),
15 - new link("wellness-tools", "The Wellness Tools", "http://aia5.adam.com/content.aspx?productId=20", "100%", "1500px") 15 + new link("wellness-tools", "The Wellness Tools", "http://aia5.adam.com/content.aspx?productId=20", "100%", "1500px"),
  16 + new link("aod", "A.D.A.M OnDemand", "http://uat.adamondemand.com/Home/AIACatalog?categoriesID=2", "100%", "1500px")
16 ]; 17 ];
17 18
18 $scope.$on('$viewContentLoaded', function (event) { 19 $scope.$on('$viewContentLoaded', function (event) {
400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
@@ -132,6 +132,13 @@ AIA.constant(&#39;pages&#39;, [ @@ -132,6 +132,13 @@ AIA.constant(&#39;pages&#39;, [
132 pageController: 'LinkController' 132 pageController: 'LinkController'
133 133
134 }, 134 },
  135 + {
  136 + name: 'A.D.A.M OnDemand',
  137 + pageSlug: 'Link/aod',
  138 + pageUrl: 'app/views/Link/Link-view.html',
  139 + pageController: 'LinkController'
  140 +
  141 + },
135 { //id:18, 142 { //id:18,
136 name: 'home', 143 name: 'home',
137 pageSlug: 'home', 144 pageSlug: 'home',