ADAM / AIAHTML5

Commit 212a5d745b5f3f90b5301934efde324f8e1d5cf4

Authored by unknown
2 parents fd7b7162 a61abb82

Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into IEAnnotationIssue

Inline Side-by-side
Showing 4 changed files with 12 additions and 12 deletions
400-SOURCECODE/AIAHTML5.API/Web.config
  View file @212a5d7
... ... @@ -39,7 +39,7 @@
39 39 <add key="EnableSSL" value="false" />
40 40 <add key="Site_Url" value ="//52.2.38.120"/>
41 41 <add key ="HostAddress" value="10.100.12.13" />
42   - <add key="isUserAuthenticated" value="true"/>
  42 + <add key="isUserAuthenticated" value="false"/>
43 43 <add key="AdminSupport" value="amrita.vishnoi@ebix.com,nikita.kulshreshtha@ebix.com"/>
44 44 </appSettings>
45 45 <system.web>
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js
  View file @212a5d7
... ... @@ -8,11 +8,11 @@ function ($scope, $rootScope, log, pages, $routeParams) {
8 8 $scope.links = [
9 9 new link("encyclopedia", "Encyclopedia", 'http://aia5.adam.com/content.aspx?productId=117', "100%", "750px"),
10 10 new link("IP-10", "IP 10", "http://interactiveanatomy.com/IPWeb10/index.aspx", "100%", "750px"),
11   - new link("indepth-reports", "InDepth Reports", "http://aia5.adam.com/content.aspx?productId=10", "100%", "4000px"),
12   - new link("complementary-and-alternate-medicine", "Complementary and Alternative Medicine", "http://interactiveanatomy.com/CAMHome.aspx", "100%", "750px"),
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"),
15   - new link("wellness-tools", "The Wellness Tools", "http://aia5.adam.com/content.aspx?productId=20", "100%", "1500px"),
  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 16 new link("aod", "A.D.A.M OnDemand", "http://uat.adamondemand.com/Home/AIACatalog?categoriesID=2", "100%", "1500px")
17 17 ];
18 18  
... ...
400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
  View file @212a5d7
... ... @@ -119,8 +119,8 @@ AIA.constant(&#39;pages&#39;, [
119 119  
120 120 },
121 121 { //id:16,
122   - name: 'Symptom Navigator',
123   - pageSlug: 'Link/symptom-navigator',
  122 + name: 'Health Navigator',
  123 + pageSlug: 'Link/health-navigator',
124 124 pageUrl: 'app/views/Link/Link-view.html',
125 125 pageController: 'LinkController'
126 126  
... ... @@ -256,7 +256,7 @@ AIA.constant(&#39;Modules&#39;, [
256 256 },
257 257 {
258 258 Id: 16,
259   - Name: 'Symptom Navigator',
  259 + Name: 'Health Navigator',
260 260 },
261 261 {
262 262 Id: 17,
... ... @@ -385,8 +385,8 @@ AIA.constant(&quot;UserModules&quot;, [
385 385 "slug": "Link/bodyguide"
386 386 },
387 387 {
388   - "name": "Symptom Navigator",
389   - "slug": "Link/symptom-navigator"
  388 + "name": "Health Navigator",
  389 + "slug": "Link/health-navigator"
390 390 },
391 391 {
392 392 "name": "The Wellness Tools",
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @212a5d7
... ... @@ -1273,7 +1273,7 @@
1273 1273 <div class="col-sm-8">• Complementary and Alternative Medicine</div>
1274 1274 </div>
1275 1275 <div class="form-group">
1276   - <div class="col-sm-8">• Symptom Navigator</div>
  1276 + <div class="col-sm-8">• Health Navigator</div>
1277 1277 </div>
1278 1278 <div class="form-group">
1279 1279 <div class="col-sm-8">• The Wellness Tool</div>
... ...