ADAM / AIAHTML5

Commit 9681f399297041195083789c50c02fddfca87762

Authored by Mitali Srivastava
1 parent 3b63ade0

Single controller for external pages

Inline Side-by-side
Showing 8 changed files with 123 additions and 92 deletions
400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj
  View file @9681f39
... ... @@ -14,7 +14,7 @@
14 14 <RootNamespace>eLearningPlayer</RootNamespace>
15 15 <AssemblyName>eLearningPlayer</AssemblyName>
16 16 <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
17   - <UseIISExpress>false</UseIISExpress>
  17 + <UseIISExpress>true</UseIISExpress>
18 18 <IISExpressSSLPort />
19 19 <IISExpressAnonymousAuthentication />
20 20 <IISExpressWindowsAuthentication />
... ... @@ -40,43 +40,32 @@
40 40 <ItemGroup>
41 41 <Content Include="app\controllers\3dAController.js" />
42 42 <Content Include="app\controllers\ADAMImgController.js" />
43   - <Content Include="app\controllers\ADAMPID117Controller.js" />
  43 + <Content Include="app\controllers\LinkController.js" />
44 44 <Content Include="app\controllers\AnatTestController.js" />
45 45 <Content Include="app\controllers\AODController.js" />
46 46 <Content Include="app\controllers\AuthenticationController.js" />
47   - <Content Include="app\controllers\BodyGuideController.js" />
48 47 <Content Include="app\controllers\CAController.js" />
49 48 <Content Include="app\controllers\CBuildController.js" />
50 49 <Content Include="app\controllers\CIController.js" />
51   - <Content Include="app\controllers\CompAndAltMedController.js" />
52 50 <Content Include="app\controllers\DAController.js" />
53 51 <Content Include="app\controllers\HomeController.js" />
54   - <Content Include="app\controllers\InDepthController.js" />
55   - <Content Include="app\controllers\IP10Controller.js" />
56 52 <Content Include="app\controllers\LabExercController.js" />
57   - <Content Include="app\controllers\SymptNavController.js" />
58   - <Content Include="app\controllers\WellToolsController.js" />
59 53 <Content Include="app\main\AIA.js" />
  54 + <Content Include="app\main\Link.js" />
60 55 <Content Include="app\services\AuthenticationService.js" />
61 56 <Content Include="app\services\DataService.js" />
62 57 <Content Include="app\views\3dA\3dA-view.html" />
63 58 <Content Include="app\views\ADAMImg\ADAMImg-view.html" />
64   - <Content Include="app\views\ADAMPID117\ADAMPID117-view.html" />
  59 + <Content Include="app\views\Link\Link-view.html" />
65 60 <Content Include="app\views\AnatTest\AnatTest-view.html" />
66 61 <Content Include="app\views\AOD\AOD-view.html" />
67   - <Content Include="app\views\BodyGuide\BodyGuide-view.html" />
68 62 <Content Include="app\views\ca\ca-view.html" />
69 63 <Content Include="app\views\CBuild\CBuild-view.html" />
70 64 <Content Include="app\views\ci\ci-view.html" />
71   - <Content Include="app\views\CompAndAltMed\CompAndAltMed-view.html" />
72 65 <Content Include="app\views\da\da-body-view-list.html" />
73 66 <Content Include="app\views\da\da-body-view.html" />
74 67 <Content Include="app\views\da\da-view.html" />
75   - <Content Include="app\views\InDepth\InDepth-view.html" />
76   - <Content Include="app\views\IP10\IP10-view.html" />
77 68 <Content Include="app\views\LabExerc\LabExerc-view.html" />
78   - <Content Include="app\views\SymptNav\SymptNav-view.html" />
79   - <Content Include="app\views\WellTools\WellTools-view.html" />
80 69 <Content Include="app\widget\MainMenu.html" />
81 70 <Content Include="content\css\main.css" />
82 71 <Content Include="content\images\1.jpg" />
... ... @@ -21350,11 +21339,11 @@
21350 21339 <VisualStudio>
21351 21340 <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
21352 21341 <WebProjectProperties>
21353   - <UseIIS>False</UseIIS>
  21342 + <UseIIS>True</UseIIS>
21354 21343 <AutoAssignPort>True</AutoAssignPort>
21355 21344 <DevelopmentServerPort>55837</DevelopmentServerPort>
21356 21345 <DevelopmentServerVPath>/</DevelopmentServerVPath>
21357   - <IISUrl>http://localhost/AIA</IISUrl>
  21346 + <IISUrl>http://localhost:55837/AIAHTML5</IISUrl>
21358 21347 <NTLMAuthentication>False</NTLMAuthentication>
21359 21348 <UseCustomServer>False</UseCustomServer>
21360 21349 <CustomServerUrl>http://182.19.10.91/AIAHTML5</CustomServerUrl>
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/ADAMPID117Controller.js deleted
View file @3b63ade
1   -AIA.controller("ADAMPID117Controller", ["$scope", "$rootScope", "Modules", "$log",
2   -function ($scope, $rootScope, Modules, log) {
3   -
4   - $rootScope.currentActiveModuleTitle = Modules[10].Name;
5   - $scope.showme = false;
6   - $scope.myObj = {
7   - "width": "100%",
8   - "min-height": "750px"
9   - }
10   - $scope.IsVisible = function () {
11   - $scope.scroll();
12   -
13   - }
14   -
15   - $scope.scroll = function () {
16   - // $window.scrollTo(0, 0);
17   - $("html,body").scrollTop(0);
18   - //alert("scroll");
19   - }
20   -
21   -}]
22   -
23   -
24   -);
25   -
26   -
400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js 0 → 100644
  View file @9681f39
  1 +'use strict';
  2 +
  3 +AIA.controller("LinkController", ["$scope", "$rootScope", "Modules", "$log", "pages", "$routeParams",
  4 +function ($scope, $rootScope, Modules, log, pages, $routeParams) {
  5 +
  6 + //$rootScope.currentActiveModuleTitle = Modules[10].Name;
  7 + //$rootScope.currentActiveModuleTitle = $routeParams.modname;
  8 + $scope.links = [
  9 + new link("Encyclopedia", "Encyclopedia", 'http://aia5.adam.com/content.aspx?productId=117', "100%", "750px"),
  10 + new link("IP-10", "IP 10", "http://182.19.10.91:92/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://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"),
  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")
  16 + ];
  17 +
  18 + $scope.$on('$viewContentLoaded', function (event) {
  19 + // code that will be executed ...
  20 + // every time this view is loaded
  21 +
  22 + for (var i = 0; i < $scope.links.length; i++) {
  23 + if ($scope.links[i].modname == $routeParams.modname) {
  24 + $rootScope.currentActiveModuleTitle = $scope.links[i].title;
  25 + $scope.objdata = $scope.links[i].objurl;
  26 + $scope.myObj = $scope.links[i].objstyle;
  27 + }
  28 + }
  29 + });
  30 +
  31 + $scope.showme = false;
  32 + $scope.IsVisible = function () {
  33 + $scope.scroll();
  34 +
  35 + }
  36 +
  37 + $scope.scroll = function () {
  38 + // $window.scrollTo(0, 0);
  39 + $("html,body").scrollTop(0);
  40 + //alert("scroll");
  41 + }
  42 +}]
  43 +
  44 +
  45 +);
  46 +
  47 +
... ...
400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
  View file @9681f39
... ... @@ -25,107 +25,107 @@ AIA.constant(&#39;pages&#39;, [
25 25 },
26 26 {
27 27 name: 'Clinical Illustrations',
28   - pageSlug: 'ci-view',
  28 + pageSlug: 'CI-view',
29 29 pageUrl: 'app/views/ci/ci-view.html',
30 30 pageController: 'CIController'
31 31  
32 32 },
33 33 {
34 34 name: 'Clinical Animationa',
35   - pageSlug: 'ca-view',
  35 + pageSlug: 'CA-view',
36 36 pageUrl: 'app/views/ca/ca-view.html',
37 37 pageController: 'CAController'
38 38  
39 39 },
40 40 {
41 41 name: '3D Anatomy',
42   - pageSlug: '3dA-view',
  42 + pageSlug: '3dAnatomy-view',
43 43 pageUrl: 'app/views/3dA/3dA-view.html',
44 44 pageController: '3dAController'
45 45  
46 46 },
47 47 {
48 48 name: 'Curriculum Builder',
49   - pageSlug: 'CBuild-view',
  49 + pageSlug: 'Curriculum-Builder',
50 50 pageUrl: 'app/views/CBuild/CBuild-view.html',
51 51 pageController: 'CBuildController'
52 52  
53 53 },
54 54 {
55 55 name: 'Anatomy Tests',
56   - pageSlug: 'AnatTest-view',
  56 + pageSlug: 'Anatomy-Test',
57 57 pageUrl: 'app/views/AnatTest/AnatTest-view.html',
58 58 pageController: 'AnatTestController'
59 59  
60 60 },
61 61 {
62 62 name: 'Lab Exercises',
63   - pageSlug: 'LabExerc-view',
  63 + pageSlug: 'Lab-Exercises',
64 64 pageUrl: 'app/views/LabExerc/LabExerc-view.html',
65 65 pageController: 'LabExercController'
66 66  
67 67 },
68 68 {
69 69 name: 'ADAM Images',
70   - pageSlug: 'ADAMImg-view',
  70 + pageSlug: 'ADAM-Images',
71 71 pageUrl: 'app/views/ADAMImg/ADAMImg-view.html',
72 72 pageController: 'ADAMImgController'
73 73  
74 74 },
75 75 {
76 76 name: 'ADAM On Demand',
77   - pageSlug: 'AOD-view',
  77 + pageSlug: 'ADAM-On-Demand',
78 78 pageUrl: 'app/views/AOD/AOD-view.html',
79 79 pageController: 'AODController'
80 80  
81 81 },
82 82 {
83 83 name: 'Encyclopedia',
84   - pageSlug: 'ADAMPID117-view',
85   - pageUrl: 'app/views/ADAMPID117/ADAMPID117-view.html',
86   - pageController: 'ADAMPID117Controller'
  84 + pageSlug: 'Link/Encyclopedia',
  85 + pageUrl: 'app/views/Link/Link-view.html',
  86 + pageController: 'LinkController'
87 87  
88 88 },
89 89 {
90 90 name: 'IP 10',
91   - pageSlug: 'IP10-view',
92   - pageUrl: 'app/views/IP10/IP10-view.html',
93   - pageController: 'IP10Controller'
  91 + pageSlug: 'Link/IP-10',
  92 + pageUrl: 'app/views/Link/Link-view.html',
  93 + pageController: 'LinkController'
94 94  
95 95 },
96 96 {
97 97 name: 'In-Depth Reports',
98   - pageSlug: 'InDepth-view',
99   - pageUrl: 'app/views/InDepth/InDepth-view.html',
100   - pageController: 'InDepthController'
  98 + pageSlug: 'Link/InDepth-Reports',
  99 + pageUrl: 'app/views/Link/Link-view.html',
  100 + pageController: 'LinkController'
101 101  
102 102 },
103 103 {
104 104 name: 'Complementary and Alternative Medicine',
105   - pageSlug: 'CompAndAltMed-view',
106   - pageUrl: 'app/views/CompAndAltMed/CompAndAltMed-view.html',
107   - pageController: 'CompAndAltMedController'
  105 + pageSlug: 'Link/Complementary-and-Alternate-Medicine',
  106 + pageUrl: 'app/views/Link/Link-view.html',
  107 + pageController: 'LinkController'
108 108  
109 109 },
110 110 {
111 111 name: 'Body Guide',
112   - pageSlug: 'BodyGuide-view',
113   - pageUrl: 'app/views/BodyGuide/BodyGuide-view.html',
114   - pageController: 'BodyGuideController'
  112 + pageSlug: 'Link/BodyGuide',
  113 + pageUrl: 'app/views/Link/Link-view.html',
  114 + pageController: 'LinkController'
115 115  
116 116 },
117 117 {
118 118 name: 'Symptom Navigator',
119   - pageSlug: 'SymptNav-view',
120   - pageUrl: 'app/views/SymptNav/SymptNav-view.html',
121   - pageController: 'SymptNavController'
  119 + pageSlug: 'Link/Symptom-Navigator',
  120 + pageUrl: 'app/views/Link/Link-view.html',
  121 + pageController: 'LinkController'
122 122  
123 123 },
124 124 {
125 125 name: 'The Wellness Tools',
126   - pageSlug: 'WellTools-view',
127   - pageUrl: 'app/views/WellTools/WellTools-view.html',
128   - pageController: 'WellToolsController'
  126 + pageSlug: 'Link/Wellness-Tools',
  127 + pageUrl: 'app/views/Link/Link-view.html',
  128 + pageController: 'LinkController'
129 129  
130 130 },
131 131 {
... ... @@ -190,6 +190,7 @@ AIA.constant(&#39;Modules&#39;, [
190 190 {
191 191 Id: 11,
192 192 Name: 'Encyclopedia',
  193 +
193 194 },
194 195 {
195 196 Id: 12,
... ... @@ -236,7 +237,12 @@ AIA.config(function ($routeProvider, pages, $locationProvider) {
236 237 {
237 238 templateUrl: pages[i].pageUrl,
238 239 controller: pages[i].pageController
239   - })
  240 + }).
  241 + when('/Link/:modname',
  242 + {
  243 + templateUrl: 'app/views/Link/Link-view.html',
  244 + controller: 'LinkController'
  245 + })
240 246 .otherwise({
241 247 templateUrl: 'app/widget/MainView.html',
242 248 controller: 'HomeController'
... ...
400-SOURCECODE/AIAHTML5.Web/app/main/Link.js 0 → 100644
  View file @9681f39
  1 +//----------------------------------------------------------------
  2 +// Link class
  3 +function link(modname,title, objurl, width, min_height) {
  4 + this.modname = modname; // Module name (modname = Module Name)
  5 + this.title = title;
  6 + this.objurl = objurl;
  7 + this.objstyle = {
  8 + "width": width,
  9 + "min-height": min_height
  10 + };
  11 +}
0 12 \ No newline at end of file
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/ADAMPID117/ADAMPID117-view.html renamed to 400-SOURCECODE/AIAHTML5.Web/app/views/Link/Link-view.html
  View file @9681f39
... ... @@ -2,7 +2,8 @@
2 2 <div ng-include="'app/widget/MainMenu.html'" />
3 3 <div class="main" style="min-height:750px;">
4 4 <div id="siteloader" class="col-sm-12">
5   - <object ng-style="myObj" type="text/html" data="http://aia5.adam.com/content.aspx?productId=117"></object>
  5 + <!--<object style="width:100%; height:100%" type="text/html" data={{objdata}}></object>-->
  6 + <object ng-style="myObj" type="text/html" data={{objdata}}></object>
6 7 </div>
7 8 </div>
8 9 </div>
... ...
400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html
  View file @9681f39
... ... @@ -19,28 +19,29 @@
19 19 <ul class="nav nav-sidebar" ng-init="hideScrollbar()">
20 20 <li><a href="da-view-list" ng-click="IsVisible()">Dissectible Anatomy</a></li>
21 21 <!--<li><a href="atlas-anatomy.html">Atlas Anatomy</a></li>-->
22   - <li><a href="3dA-view" ng-click="IsVisible()">3D Anatomy</a></li>
23   - <li><a href="ci-view" ng-click="IsVisible()">Clinical Illustrations</a></li>
24   - <li><a href="ca-view" ng-click="IsVisible()">Clinical Animations</a></li>
  22 + <li><a href="3dAnatomy-view" ng-click="IsVisible()">3D Anatomy</a></li>
  23 + <li><a href="CI-view" ng-click="IsVisible()">Clinical Illustrations</a></li>
  24 + <li><a href="CA-view" ng-click="IsVisible()">Clinical Animations</a></li>
25 25 <!--<li><a href="http://aia5.adam.com/content.aspx?productId=117&ref=www.interactiveanatomy.com&url=aia5.adam.com" target="_blank">Encyclopedia</a></li>-->
26   - <li><a href="ADAMPID117-view" ng-click="IsVisible()">Encyclopedia</a></li>
27   - <li><a href="CBuild-view" ng-click="IsVisible()">Curriculum Builder</a></li>
28   - <li><a href="AnatTest-view" ng-click="IsVisible()">Anatomy Tests</a></li>
  26 + <li><a href="Link/Encyclopedia" ng-click="IsVisible()">Encyclopedia</a></li>
  27 + <li><a href="Curriculum-Builder" ng-click="IsVisible()">Curriculum Builder</a></li>
  28 + <li><a href="Anatomy-Test" ng-click="IsVisible()">Anatomy Tests</a></li>
29 29 <!--<li><a href="http://182.19.10.91:92/IPWeb10/index.aspx" target="_blank">IP 10</a></li>-->
30   - <li><a href="IP10-view" ng-click="IsVisible()">IP 10</a></li>
31   - <li><a href="LabExerc-view" ng-click="IsVisible()">Lab Exercises</a></li>
  30 + <!--<li><a href="IP10-view" ng-click="IsVisible()">IP 10</a></li>-->
  31 + <li><a href="Link/IP-10" ng-click="IsVisible()">IP 10</a></li>
  32 + <li><a href="Lab-Exercises" ng-click="IsVisible()">Lab Exercises</a></li>
32 33 <!--<li><a href="http://182.19.10.91:92/IndepthHome.aspx" target="_blank">In-Depth Reports</a></li>-->
33   - <li><a href="InDepth-view" ng-click="IsVisible()">In-Depth Reports</a></li>
  34 + <li><a href="Link/InDepth-Reports" ng-click="IsVisible()">In-Depth Reports</a></li>
34 35 <!--<li><a href="http://182.19.10.91:92/CAMHome.aspx" target="_blank">Complementary and Alternative Medicine</a></li>-->
35   - <li><a href="CompAndAltMed-view" ng-click="IsVisible()">Complementary and Alternative Medicine</a></li>
36   - <li><a href="ADAMImg-view" ng-click="IsVisible()">A.D.A.M Images</a></li>
  36 + <li><a href="Link/Complementary-and-Alternate-Medicine" ng-click="IsVisible()">Complementary and Alternative Medicine</a></li>
  37 + <li><a href="ADAM-Images" ng-click="IsVisible()">A.D.A.M Images</a></li>
37 38 <!--<li><a href="http://aia5.adam.com/content.aspx?productId=25&ref=www.interactiveanatomy.com&url=aia5.adam.com" target="_blank">Body Guide</a></li>-->
38   - <li><a href="BodyGuide-view" ng-click="IsVisible()">Body Guide</a></li>
  39 + <li><a href="Link/BodyGuide" ng-click="IsVisible()">Body Guide</a></li>
39 40 <!--<li><a href="http://aia5.adam.com/content.aspx?productId=44&pid=44&gid=000001&ref=www.interactiveanatomy.com&url=aia5.adam.com" target="_blank">Symptom Navigator</a></li>-->
40   - <li><a href="SymptNav-view" ng-click="IsVisible()">Symptom Navigator</a></li>
  41 + <li><a href="Link/Symptom-Navigator" ng-click="IsVisible()">Symptom Navigator</a></li>
41 42 <!--<li><a href="http://aia5.adam.com/content.aspx?productId=20&ref=www.interactiveanatomy.com&url=aia5.adam.com" target="_blank">The Wellness Tools</a></li>-->
42   - <li><a href="WellTools-view" ng-click="IsVisible()">The Wellness Tools</a></li>
43   - <li><a href="AOD-view" ng-click="IsVisible()">A.D.A.M OnDemand</a></li>
  43 + <li><a href="Link/Wellness-Tools" ng-click="IsVisible()">The Wellness Tools</a></li>
  44 + <li><a href="ADAM-On-Demand" ng-click="IsVisible()">A.D.A.M OnDemand</a></li>
44 45 </ul>
45 46 </div>
46 47  
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @9681f39
... ... @@ -5,6 +5,7 @@
5 5 <meta charset="utf-8">
6 6 <meta http-equiv="X-UA-Compatible" content="IE=edge">
7 7 <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
  8 + <!--<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1.0 maximum-scale=1.0" />-->
8 9 <title>A.D.A.M. Interactive Anatomy</title>
9 10  
10 11 <link href="themes/default/css/bootstrap/3.3.6/bootstrap.css" rel="stylesheet" />
... ... @@ -145,6 +146,7 @@
145 146  
146 147 <!--<script src="libs/jquery/jquery_plugin/jsPanel/jspanel/jquery.jspanel.min.js"></script>-->
147 148 <script src="app/main/AIA.js"></script>
  149 + <script src="app/main/Link.js"></script>
148 150  
149 151 <script src="content/js/custom/custom.js"></script>
150 152 <script src="app/controllers/DAController.js"></script>
... ... @@ -157,13 +159,13 @@
157 159 <script src="app/controllers/ADAMImgController.js"></script>
158 160 <script src="app/controllers/AODController.js"></script>
159 161 <script src="app/controllers/HomeController.js"></script>
160   - <script src="app/controllers/ADAMPID117Controller.js"></script>
161   - <script src="app/controllers/BodyGuideController.js"></script>
  162 + <script src="app/controllers/LinkController.js"></script>
  163 + <!--<script src="app/controllers/BodyGuideController.js"></script>
162 164 <script src="app/controllers/CompAndAltMedController.js"></script>
163 165 <script src="app/controllers/InDepthController.js"></script>
164 166 <script src="app/controllers/IP10Controller.js"></script>
165 167 <script src="app/controllers/SymptNavController.js"></script>
166   - <script src="app/controllers/WellToolsController.js"></script>
  168 + <script src="app/controllers/WellToolsController.js"></script>-->
167 169 <script src="app/services/DataService.js"></script>
168 170  
169 171  
... ...