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

unknown
2 parents dcab32ad 8687ecfc
Showing 13 changed files with 20 additions and 20 deletions
150-DOCUMENTATION/AIA-ActionPlan.xlsx
150-DOCUMENTATION/AIA-Timelines-V1.02.xlsx
150-DOCUMENTATION/AIA-Timelines-V1.03.xlsx
150-DOCUMENTATION/AIA-Timelines-V1.05.xlsx
150-DOCUMENTATION/AIA-Timelines-V1.10-2017-03-08.xlsx
150-DOCUMENTATION/AIA-Timelines-V1.10-2017-03-15.xlsx
150-DOCUMENTATION/AIA-Timelines-V1.14.xlsx
150-DOCUMENTATION/AIA-Timelines.xlsx
150-DOCUMENTATION/AIA_DailyScrum.xlsx
150-DOCUMENTATION/Audit/Estimation/Ebix-Estimation Model_Health_Dev-Product Sprint 34(17-April-17).xlsx
400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js
400-SOURCECODE/AIAHTML5.Web/app/main/Link.js
400-SOURCECODE/AIAHTML5.Web/app/views/Link/Link-view.html
@@ -6,7 +6,7 @@ function ($scope, $rootScope, log, pages, $routeParams) {
      //$rootScope.currentActiveModuleTitle = Modules[10].Name;
     //$rootScope.currentActiveModuleTitle = $routeParams.modname;
     $scope.links = [
-        new link("encyclopedia", "Encyclopedia", 'http://aia5.adam.com/content.aspx?productId=117', "100%", "750px"),
+        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"),
-//----------------------------------------------------------------
-// Link class
-function link(modname,title, objurl, width, min_height) {
-    this.modname = modname; // Module name (modname = Module Name)
-    this.title = title;
-    this.objurl = objurl;
-    this.objstyle = {
-        "width": width,
-        "min-height": min_height
-    };
+//----------------------------------------------------------------
+// Link class
+function link(modname,title, objurl, width, min_height) {
+    this.modname = modname; // Module name (modname = Module Name)
+    this.title = title;
+    this.objurl = objurl;
+    this.objstyle = {
+        "width": width,
+        //"min-height": min_height
+    };
 }
 \ No newline at end of file
-<div class="bodyWrap row ">
-    <div ng-include="'app/widget/MainMenu.html'" />
-    <div class="main" style="min-height:750px;">
-        <div id="siteloader" class="col-sm-12">
-            <!--<object style="width:100%; height:100%" type="text/html" data={{objdata}}></object>-->
-            <object ng-style="myObj" type="text/html" data={{objdata}}></object>
-        </div>
-    </div>
-</div>
+<div class="bodyWrap row ">
+    <div ng-include="'app/widget/MainMenu.html'" />
+    <div class="main" style="min-height:750px;">
+        <div id="siteloader" class="col-sm-12">
+            <!--<object style="width:100%; height:100%" type="text/html" data={{objdata}}></object>-->
+            <object id="externalLink" ng-style="myObj" type="text/html" data={{objdata}}></object>
+        </div>
+    </div>
+</div>