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

unknown
2 parents fd7b7162 a61abb82
Showing 4 changed files with 12 additions and 12 deletions
400-SOURCECODE/AIAHTML5.API/Web.config
400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js
400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
400-SOURCECODE/AIAHTML5.Web/index.html
@@ -39,7 +39,7 @@
     <add key="EnableSSL" value="false" />
     <add key="Site_Url" value ="//52.2.38.120"/>
     <add key ="HostAddress" value="10.100.12.13" />
-    <add key="isUserAuthenticated" value="true"/>
+    <add key="isUserAuthenticated" value="false"/>
     <add key="AdminSupport" value="amrita.vishnoi@ebix.com,nikita.kulshreshtha@ebix.com"/>
   </appSettings>  
   <system.web>
@@ -8,11 +8,11 @@ function ($scope, $rootScope, log, pages, $routeParams) {
     $scope.links = [
         new link("encyclopedia", "Encyclopedia", 'http://aia5.adam.com/content.aspx?productId=117', "100%", "750px"),
         new link("IP-10", "IP 10", "http://interactiveanatomy.com/IPWeb10/index.aspx", "100%", "750px"),
-        new link("indepth-reports", "InDepth Reports", "http://aia5.adam.com/content.aspx?productId=10", "100%", "4000px"),
-        new link("complementary-and-alternate-medicine", "Complementary and Alternative Medicine", "http://interactiveanatomy.com/CAMHome.aspx", "100%", "750px"),
-        new link("bodyguide", "Body Guide", "http://aia5.adam.com/content.aspx?productId=25", "100%", "1050px"),
-        new link("symptom-navigator", "Symptom Navigator", "http://aia5.adam.com/content.aspx?productId=44", "100%", "1000px"),
-        new link("wellness-tools", "The Wellness Tools", "http://aia5.adam.com/content.aspx?productId=20", "100%", "1500px"),
+        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")
     ];
@@ -119,8 +119,8 @@ AIA.constant(&#39;pages&#39;, [
     },
     {   //id:16,
-        name: 'Symptom Navigator',
-        pageSlug: 'Link/symptom-navigator',
+        name: 'Health Navigator',
+        pageSlug: 'Link/health-navigator',
         pageUrl: 'app/views/Link/Link-view.html',
         pageController: 'LinkController'
@@ -256,7 +256,7 @@ AIA.constant(&#39;Modules&#39;, [
      },
      {
         Id: 16,
-        Name: 'Symptom Navigator',
+        Name: 'Health Navigator',
      },
      {
         Id: 17,
@@ -385,8 +385,8 @@ AIA.constant(&quot;UserModules&quot;, [
         "slug": "Link/bodyguide"
     },
     {
-        "name": "Symptom Navigator",
-        "slug": "Link/symptom-navigator"
+        "name": "Health Navigator",
+        "slug": "Link/health-navigator"
     },
     {
         "name": "The Wellness Tools",
@@ -1273,7 +1273,7 @@
                                 <div class="col-sm-8">• Complementary and Alternative Medicine</div>
                             </div>
                             <div class="form-group">
-                                <div class="col-sm-8">• Symptom Navigator</div>
+                                <div class="col-sm-8">• Health Navigator</div>
                             </div>
                             <div class="form-group">
                                 <div class="col-sm-8">• The Wellness Tool</div>