ADAM / AIAHTML5

Commit 22a4ed9b4cc8909a295c33f7f681164d9f4a5bbb

Authored by Nikita Kulshreshtha
1 parent 4f59a9df

changed index page. deleted ng-include and added ng-view. 

the idea is, Now in index page different views will be laoded as pe requiremnet and all views will have mainmenu included in views.
Currently its not working.
Inline Side-by-side
Showing 7 changed files with 36 additions and 26 deletions
400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj
  View file @22a4ed9
... ... @@ -10169,6 +10169,7 @@
10169 10169 <Content Include="libs\videogular\videogular.min.js" />
10170 10170 <Content Include="login.html" />
10171 10171 <Content Include="MainMenu.html" />
  10172 + <Content Include="MainView.html" />
10172 10173 <Content Include="themes\default\css\bootstrap\3.3.6\bootstrap-theme.css" />
10173 10174 <Content Include="themes\default\css\bootstrap\3.3.6\easyTree.css" />
10174 10175 <Content Include="themes\default\css\bootstrap\3.3.6\jquery-ui-slider-pips.css" />
... ...
400-SOURCECODE/AIAHTML5.Web/MainMenu.html
  View file @22a4ed9
1 1 <div class="bodyWrap row container-fluid">
2   - <div class="col-sm-12 col-md-12 pageHeading">
3   - <!--<button type="button" class="btn btn-success pull-left toggleBar btn-sm" data-toggle="tooltip" data-placement="top" title="Show/Hide Sidebar"> <i class="fa fa-bars"></i> </button>-->
4   - <div class=" pull-left toggleBar toggleHeadingButton" data-toggle="tooltip" data-placement="top" title="Show/Hide Sidebar" style="padding-left: 15px; "> <i class="fa fa-bars"></i> </div>
5   - <h4 class="pull-left" ng->{{currentActiveModuleTitle}}</h4>
6   - <div class="clearfix" style=""></div>
7   - </div>
  2 +
8 3 <!--Sidebar-->
9 4 <div class="sidebar pull-left">
10 5 <ul class="nav nav-sidebar">
11 6 <li><a href="da-view-list">Dissectible Anatomy</a></li>
12   - <li><a href="atlas-anatomy.html">Atlas Anatomy</a></li>
  7 + <!--<li><a href="atlas-anatomy.html">Atlas Anatomy</a></li>-->
13 8 <li><a href="3d-anatomy.html">3D Anatomy</a></li>
14 9 <li><a href="clinical-illustrations.html">Clinical Illustrations</a></li>
15 10 <li><a href="clinical-animations.html">Clinical Animations</a></li>
... ... @@ -27,12 +22,7 @@
27 22 <li><a href="adamondemand.html">A.D.A.M OnDemand</a></li>
28 23 </ul>
29 24 </div>
30   - <div class="main">
31   - <div class="col-sm-12">
32   - <div align="center" id="MainImage"><img src="content/images/img1.png" alt="" title="" class="img-responsive"></div>
33   - <div ng-view></div>
34   - </div>
35   - </div>
  25 +
36 26 </div>
37 27  
38 28  
... ...
400-SOURCECODE/AIAHTML5.Web/MainView.html 0 → 100644
  View file @22a4ed9
  1 +<div class="bodyWrap row">
  2 + <!--<div ng-include="'MainMenu.html'"/>-->
  3 + <div class="main">
  4 + <div class="col-sm-12">
  5 + <div align="center" id="MainImage"><img src="content/images/img1.png" alt="" title="" class="img-responsive"></div>
  6 + <div ng-view></div>
  7 + </div>
  8 + </div>
  9 +</div>
0 10 \ No newline at end of file
... ...
400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
  View file @22a4ed9
... ... @@ -23,12 +23,12 @@ AIA.constant(&#39;pages&#39;, [
23 23 pageUrl: 'app/views/da/da-body-view.html',
24 24 pageController: 'DAController'
25 25 },
26   - {
27   - name: 'index',
28   - pageSlug: 'index',
29   - pageUrl: 'index.html',
30   - pageController: 'HomeController'
31   - },
  26 + //{
  27 + // name: 'index',
  28 + // pageSlug: 'index',
  29 + // pageUrl: 'MainView.html',
  30 + // pageController: 'HomeController'
  31 + //},
32 32 ]);
33 33  
34 34  
... ... @@ -73,11 +73,17 @@ AIA.config(function ($routeProvider, pages, $locationProvider) {
73 73  
74 74 for (var i = 0; i < pages.length; i++) {
75 75 if (pages[i].pageSlug != null) {
76   - $routeProvider.when('/' + pages[i].pageSlug,
  76 + $routeProvider.
  77 + when('/' + pages[i].pageSlug,
77 78 {
78 79 templateUrl: pages[i].pageUrl,
79 80 controller: pages[i].pageController
80   - })
  81 + })
  82 + .otherwise({
  83 + templateUrl:'MainView.html',
  84 + controller: 'HomeController'
  85 + })
  86 +
81 87 }
82 88 }
83 89 });
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-body-view-list.html
  View file @22a4ed9
1   -
2   -<div ng-init="loadDissectibleAnatomyData()">
  1 +<div ng-init="loadDissectibleAnatomyData()">
3 2 <!--<div class="main">-->
4 3 <div class="col-sm-12">
5 4 <div id="inner-anatomyPage">
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-body-view.html
  View file @22a4ed9
1 1 
2 2 <div ng-app="AIA" ng-controller="DAController">
  3 + <div ng-include="MainMenu.html"></div>
3 4 <div ng-init="openBodyView()" id="daView"></div>
4 5 <div class=" daView">
5 6  
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @22a4ed9
... ... @@ -49,10 +49,14 @@
49 49 </nav>
50 50 <div class="bodyWrap row">
51 51  
52   - <!--Body-->
53   -
  52 + <div class="col-sm-12 col-md-12 pageHeading">
  53 + <!--<button type="button" class="btn btn-success pull-left toggleBar btn-sm" data-toggle="tooltip" data-placement="top" title="Show/Hide Sidebar"> <i class="fa fa-bars"></i> </button>-->
  54 + <div class=" pull-left toggleBar toggleHeadingButton" data-toggle="tooltip" data-placement="top" title="Show/Hide Sidebar" style="padding-left: 15px; "> <i class="fa fa-bars"></i> </div>
  55 + <h4 class="pull-left" ng->{{currentActiveModuleTitle}}</h4>
  56 + <div class="clearfix" style=""></div>
  57 + </div>
54 58 <!--<div ng-include="'MainMenu.html'" />-->
55   - <div ng-include="pageToOpen" ></div>
  59 + <div ng-view></div>
56 60 <!--<div data-ng-include data-ng-src="' pageToOpen.name '"></div>-->
57 61 <!-- Footer
58 62 <footer>
... ...