ADAM / AIAHTML5

Commit 199708c551b7e98dc808eecf49eecf652be987f4

Authored by Nikita Kulshreshtha
1 parent 3865e151

introduced widget folder to keep menubar files. 

added rewrite settings in web.config.
fix to logo click.
added a class in sidemenubar to resolve thcik scroll bar issue.
Inline Side-by-side
Showing 10 changed files with 92 additions and 34 deletions
400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj
  View file @199708c
... ... @@ -47,6 +47,7 @@
47 47 <Content Include="app\views\da\da-body-view-list.html" />
48 48 <Content Include="app\views\da\da-body-view.html" />
49 49 <Content Include="app\views\da\da-view.html" />
  50 + <Content Include="app\widget\MainMenu.html" />
50 51 <Content Include="content\css\main.css" />
51 52 <Content Include="content\images\1.jpg" />
52 53 <Content Include="content\images\1000x600.jpg" />
... ... @@ -10169,8 +10170,7 @@
10169 10170 <Content Include="libs\videogular\videogular.js" />
10170 10171 <Content Include="libs\videogular\videogular.min.js" />
10171 10172 <Content Include="login.html" />
10172   - <Content Include="MainMenu.html" />
10173   - <Content Include="MainView.html" />
  10173 + <Content Include="app\widget\MainView.html" />
10174 10174 <Content Include="themes\default\css\bootstrap\3.3.6\bootstrap-theme.css" />
10175 10175 <Content Include="themes\default\css\bootstrap\3.3.6\easyTree.css" />
10176 10176 <Content Include="themes\default\css\bootstrap\3.3.6\jquery-ui-slider-pips.css" />
... ... @@ -10230,7 +10230,7 @@
10230 10230 <Content Include="libs\jquery\jquery_plugin\jquery-ui-slider-pips.js" />
10231 10231 <Content Include="libs\jquery\jquery_plugin\jquery.mCustomScrollbar.concat.min.js" />
10232 10232 <Content Include="libs\jquery\jquery_plugin\jquery.sticky.js" />
10233   - <Content Include="TopMenu.html" />
  10233 + <Content Include="app\widget\TopMenu.html" />
10234 10234 <Content Include="Web.config" />
10235 10235 </ItemGroup>
10236 10236 <ItemGroup>
... ...
400-SOURCECODE/AIAHTML5.Web/Web.config
  View file @199708c
... ... @@ -4,24 +4,76 @@
4 4 http://go.microsoft.com/fwlink/?LinkId=169433
5 5 -->
6 6 <configuration>
  7 + <configSections>
  8 + <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
  9 + <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
  10 + </configSections>
  11 +
  12 + <appSettings>
  13 + <add key="owin:AutomaticAppStartup" value="false" />
  14 +
  15 + </appSettings>
7 16 <system.web>
8 17 <compilation debug="true" targetFramework="4.5" />
9 18 <httpRuntime targetFramework="4.5" />
10 19 </system.web>
11   - <system.webServer>
12   - <staticContent>
13   - <remove fileExtension=".mp3" />
14   - <clientCache cacheControlMode="DisableCache" />
15   - <remove fileExtension=".woff" />
16   - <mimeMap fileExtension=".woff" mimeType="application/font-woff" />
17   - <mimeMap fileExtension=".mp3" mimeType="audio/mpeg" />
18   - <mimeMap fileExtension=".woff2" mimeType="application/font-woff2" />
19   -
20   - </staticContent>
21   - <defaultDocument>
22   - <files>
23   - <add value="login.html" />
24   - </files>
25   - </defaultDocument>
26   - </system.webServer>
  20 + <system.webServer>
  21 + <rewrite>
  22 + <rules>
  23 + <rule name="AngularJS Routes" stopProcessing="true">
  24 + <match url=".*" />
  25 + <conditions logicalGrouping="MatchAll">
  26 + <add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
  27 + <add input="{REQUEST_FILENAME}" matchType="IsDirectory" negate="true" />
  28 + <add input="{REQUEST_URI}" pattern="^/(api)" negate="true" />
  29 + </conditions>
  30 + <action type="Rewrite" url="/index.html" />
  31 + </rule>
  32 + </rules>
  33 + </rewrite>
  34 + <staticContent>
  35 + <remove fileExtension=".mp3" />
  36 + <clientCache cacheControlMode="DisableCache" />
  37 + <remove fileExtension=".woff" />
  38 + <mimeMap fileExtension=".woff" mimeType="application/font-woff" />
  39 + <mimeMap fileExtension=".mp3" mimeType="audio/mpeg" />
  40 + <mimeMap fileExtension=".woff2" mimeType="application/font-woff2" />
  41 + </staticContent>
  42 + <defaultDocument enabled="true">
  43 + <files>
  44 + <clear />
  45 + <add value="Default.htm" />
  46 + <add value="login.html" />
  47 + <add value="Default.asp" />
  48 + <add value="index.htm" />
  49 + <add value="index.html" />
  50 + <add value="iisstart.htm" />
  51 + <add value="default.aspx" />
  52 + </files>
  53 + </defaultDocument>
  54 + <handlers>
  55 + <remove name="ExtensionlessUrlHandler-Integrated-4.0" />
  56 + <remove name="OPTIONSVerbHandler" />
  57 + <remove name="TRACEVerbHandler" />
  58 + <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
  59 + </handlers>
  60 + </system.webServer>
  61 + <runtime>
  62 + <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
  63 + <dependentAssembly>
  64 + <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
  65 + <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
  66 + </dependentAssembly>
  67 + </assemblyBinding>
  68 + </runtime>
  69 + <entityFramework>
  70 + <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
  71 + <parameters>
  72 + <parameter value="v11.0" />
  73 + </parameters>
  74 + </defaultConnectionFactory>
  75 + <providers>
  76 + <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
  77 + </providers>
  78 + </entityFramework>
27 79 </configuration>
28 80 \ No newline at end of file
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @199708c
... ... @@ -6,7 +6,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;,&quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, &quot;
6 6 //$scope.pageToOpen = {
7 7 // name: 'MainMenu'
8 8 //};
9   - $rootScope.pageToOpen = 'MainMenu.html';
  9 + $rootScope.pageToOpen = 'app/widget/MainMenu.html';
10 10 $rootScope.currentBodyViewId = 1;
11 11 $rootScope.currentActiveModuleTitle = 'Welcome to A.D.A.M. Interactive Anatomy';//Modules[0].Name;
12 12 $rootScope.currentActiveViewTitle;
... ... @@ -15,5 +15,11 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;,&quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, &quot;
15 15 $rootScope.openViews = [];
16 16 $rootScope.currentSlug;
17 17 $rootScope.jsPanelTitle;
  18 +
  19 +
  20 + $rootScope.ClearIframe = function () {
  21 + if ($('#daImagePanel')!=null)
  22 + $('#daImagePanel').remove();
  23 + }
18 24 }]
19 25 );
20 26 \ No newline at end of file
... ...
400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
  View file @199708c
... ... @@ -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: 'MainView.html',
30   - // pageController: 'HomeController'
31   - //},
  26 + {
  27 + name: 'home',
  28 + pageSlug: 'home',
  29 + pageUrl: 'app/widget/MainView.html',
  30 + pageController: 'HomeController'
  31 + },
32 32 ]);
33 33  
34 34  
... ... @@ -80,7 +80,7 @@ AIA.config(function ($routeProvider, pages, $locationProvider) {
80 80 controller: pages[i].pageController
81 81 })
82 82 .otherwise({
83   - templateUrl:'MainView.html',
  83 + templateUrl: 'app/widget/MainView.html',
84 84 controller: 'HomeController'
85 85 })
86 86  
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-body-view-list.html
  View file @199708c
1 1 <div class="bodyWrap row ">
2   - <div ng-include="'MainMenu.html'" />
  2 + <div ng-include="'app/widget/MainMenu.html'" />
3 3 <div class="main" ng-init="loadDissectibleAnatomyData()">
4 4 <!--<div class="main">-->
5 5 <div class="col-sm-12" style="padding-left:25px; width:99%">
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-body-view.html
  View file @199708c
1 1 
2 2 <div ng-app="AIA" ng-controller="DAController">
3   - <div ng-include="MainMenu.html"></div>
  3 + <div ng-include="aap/widget/MainMenu.html"></div>
4 4 <div ng-init="openBodyView()" id="daView"></div>
5 5 <div class=" daView">
6 6  
... ...
400-SOURCECODE/AIAHTML5.Web/MainMenu.html renamed to 400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html
  View file @199708c
... ... @@ -6,7 +6,7 @@
6 6 <div class="clearfix" style=""></div>
7 7 </div>
8 8 <!--Sidebar-->
9   - <div class="sidebar pull-left">
  9 + <div class="sidebar pull-left mCustomScrollbar _mCS_1 mCS-autoHide ">
10 10 <ul class="nav nav-sidebar">
11 11 <li><a href="da-view-list">Dissectible Anatomy</a></li>
12 12 <!--<li><a href="atlas-anatomy.html">Atlas Anatomy</a></li>-->
... ...
400-SOURCECODE/AIAHTML5.Web/MainView.html renamed to 400-SOURCECODE/AIAHTML5.Web/app/widget/MainView.html
  View file @199708c
1   -<div class="bodyWrap row">
2   - <div ng-include="'MainMenu.html'"/>
  1 +<div class="bodyWrap row" ng-init="ClearIframe()">
  2 + <div ng-include="'app/widget/MainMenu.html'"/>
3 3 <div class="main">
4 4 <div class="col-sm-12">
5 5 <div align="center" id="MainImage"><img src="content/images/img1.png" alt="" title="" class="img-responsive"></div>
... ...
400-SOURCECODE/AIAHTML5.Web/TopMenu.html renamed to 400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html
  View file @199708c
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @199708c
... ... @@ -42,9 +42,9 @@
42 42 <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#topFixedNavbar1" aria-expanded="false">
43 43 <span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span>
44 44 </button>
45   - <a class="frameLogo navbar-brand" href="welcome.html"><img src="content/images/logo-main.png" class="img-responsive" alt=""></a>
  45 + <a class="frameLogo navbar-brand" href="home"><img src="content/images/logo-main.png" class="img-responsive" alt=""></a>
46 46 </div>
47   - <div ng-include="'TopMenu.html'"></div>
  47 + <div ng-include="'app/widget/TopMenu.html'"></div>
48 48 </div>
49 49 </nav>
50 50 <div class="bodyWrap row container-fluid">
... ...