From 199708c551b7e98dc808eecf49eecf652be987f4 Mon Sep 17 00:00:00 2001 From: nikita Date: Tue, 26 Apr 2016 17:44:08 +0530 Subject: [PATCH] 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. --- 400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj | 6 +++--- 400-SOURCECODE/AIAHTML5.Web/MainMenu.html | 82 ---------------------------------------------------------------------------------- 400-SOURCECODE/AIAHTML5.Web/MainView.html | 9 --------- 400-SOURCECODE/AIAHTML5.Web/TopMenu.html | 85 ------------------------------------------------------------------------------------- 400-SOURCECODE/AIAHTML5.Web/Web.config | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------- 400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js | 8 +++++++- 400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js | 14 +++++++------- 400-SOURCECODE/AIAHTML5.Web/app/views/da/da-body-view-list.html | 2 +- 400-SOURCECODE/AIAHTML5.Web/app/views/da/da-body-view.html | 2 +- 400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 400-SOURCECODE/AIAHTML5.Web/app/widget/MainView.html | 9 +++++++++ 400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 400-SOURCECODE/AIAHTML5.Web/index.html | 4 ++-- 13 files changed, 265 insertions(+), 207 deletions(-) delete mode 100644 400-SOURCECODE/AIAHTML5.Web/MainMenu.html delete mode 100644 400-SOURCECODE/AIAHTML5.Web/MainView.html delete mode 100644 400-SOURCECODE/AIAHTML5.Web/TopMenu.html create mode 100644 400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html create mode 100644 400-SOURCECODE/AIAHTML5.Web/app/widget/MainView.html create mode 100644 400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html diff --git a/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj b/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj index b3a3632..3ea672c 100644 --- a/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj +++ b/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj @@ -47,6 +47,7 @@ + @@ -10169,8 +10170,7 @@ - - + @@ -10230,7 +10230,7 @@ - + diff --git a/400-SOURCECODE/AIAHTML5.Web/MainMenu.html b/400-SOURCECODE/AIAHTML5.Web/MainMenu.html deleted file mode 100644 index 880eca5..0000000 --- a/400-SOURCECODE/AIAHTML5.Web/MainMenu.html +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/400-SOURCECODE/AIAHTML5.Web/MainView.html b/400-SOURCECODE/AIAHTML5.Web/MainView.html deleted file mode 100644 index 43d4dfd..0000000 --- a/400-SOURCECODE/AIAHTML5.Web/MainView.html +++ /dev/null @@ -1,9 +0,0 @@ -
-
-
-
-
- -
-
-
\ No newline at end of file diff --git a/400-SOURCECODE/AIAHTML5.Web/TopMenu.html b/400-SOURCECODE/AIAHTML5.Web/TopMenu.html deleted file mode 100644 index 0be7fde..0000000 --- a/400-SOURCECODE/AIAHTML5.Web/TopMenu.html +++ /dev/null @@ -1,85 +0,0 @@ - diff --git a/400-SOURCECODE/AIAHTML5.Web/Web.config b/400-SOURCECODE/AIAHTML5.Web/Web.config index 56bc81f..4eeb25d 100644 --- a/400-SOURCECODE/AIAHTML5.Web/Web.config +++ b/400-SOURCECODE/AIAHTML5.Web/Web.config @@ -4,24 +4,76 @@ http://go.microsoft.com/fwlink/?LinkId=169433 --> + + +
+ + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js index ecc25e3..a22da61 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js @@ -6,7 +6,7 @@ AIA.controller("HomeController", ["$rootScope","Modules", "$log", "$location", " //$scope.pageToOpen = { // name: 'MainMenu' //}; - $rootScope.pageToOpen = 'MainMenu.html'; + $rootScope.pageToOpen = 'app/widget/MainMenu.html'; $rootScope.currentBodyViewId = 1; $rootScope.currentActiveModuleTitle = 'Welcome to A.D.A.M. Interactive Anatomy';//Modules[0].Name; $rootScope.currentActiveViewTitle; @@ -15,5 +15,11 @@ AIA.controller("HomeController", ["$rootScope","Modules", "$log", "$location", " $rootScope.openViews = []; $rootScope.currentSlug; $rootScope.jsPanelTitle; + + + $rootScope.ClearIframe = function () { + if ($('#daImagePanel')!=null) + $('#daImagePanel').remove(); + } }] ); \ No newline at end of file diff --git a/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js b/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js index 487bee6..cdbe426 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js @@ -23,12 +23,12 @@ AIA.constant('pages', [ pageUrl: 'app/views/da/da-body-view.html', pageController: 'DAController' }, - //{ - // name: 'index', - // pageSlug: 'index', - // pageUrl: 'MainView.html', - // pageController: 'HomeController' - //}, + { + name: 'home', + pageSlug: 'home', + pageUrl: 'app/widget/MainView.html', + pageController: 'HomeController' + }, ]); @@ -80,7 +80,7 @@ AIA.config(function ($routeProvider, pages, $locationProvider) { controller: pages[i].pageController }) .otherwise({ - templateUrl:'MainView.html', + templateUrl: 'app/widget/MainView.html', controller: 'HomeController' }) diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-body-view-list.html b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-body-view-list.html index 0a953a8..84ef56c 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-body-view-list.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-body-view-list.html @@ -1,5 +1,5 @@ 
-
+
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-body-view.html b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-body-view.html index ed6df54..43ab475 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-body-view.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-body-view.html @@ -1,6 +1,6 @@ 
-
+
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html b/400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html new file mode 100644 index 0000000..290e2be --- /dev/null +++ b/400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html @@ -0,0 +1,82 @@ + + + + + + + + \ No newline at end of file diff --git a/400-SOURCECODE/AIAHTML5.Web/app/widget/MainView.html b/400-SOURCECODE/AIAHTML5.Web/app/widget/MainView.html new file mode 100644 index 0000000..aac0023 --- /dev/null +++ b/400-SOURCECODE/AIAHTML5.Web/app/widget/MainView.html @@ -0,0 +1,9 @@ +
+
+
+
+
+ +
+
+
\ No newline at end of file diff --git a/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html b/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html new file mode 100644 index 0000000..0be7fde --- /dev/null +++ b/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html @@ -0,0 +1,85 @@ + diff --git a/400-SOURCECODE/AIAHTML5.Web/index.html b/400-SOURCECODE/AIAHTML5.Web/index.html index 596383f..9969389 100644 --- a/400-SOURCECODE/AIAHTML5.Web/index.html +++ b/400-SOURCECODE/AIAHTML5.Web/index.html @@ -42,9 +42,9 @@ - +
-
+
-- libgit2 0.21.4