diff --git a/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj b/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj index 0e1ddf7..e4ff9cf 100644 --- a/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj +++ b/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj @@ -40,6 +40,7 @@ + diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 3bf01bd..e587ddd 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -2,8 +2,8 @@ /// 'use strict'; -AIA.controller("DAController", ["$scope", "$compile", "$http", "$log", "$location", "$timeout","DA","$routeParams", -function ($scope, $compile,$http, $log, $location, $timeout,DA,$routeParam ) { +AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$log", "$location", "$timeout", "DA", "$routeParams", +function ($scope,$rootScope, $compile,$http, $log, $location, $timeout,DA,$routeParam ) { $scope.genderId = ""; $scope.BodyViewData = null; @@ -19,7 +19,7 @@ function ($scope, $compile,$http, $log, $location, $timeout,DA,$routeParam ) { //get the DA body view list based on selected gender $scope.getDAViewList = function ($event) { - debugger; + // debugger; $("#bodyViewList").empty(); //for default load if ($event == null) { @@ -40,15 +40,22 @@ function ($scope, $compile,$http, $log, $location, $timeout,DA,$routeParam ) { var userModestysettings = DA[0].modesty; var userSelectedSkintone = 'W'; $scope.userModestySetting = 'Y' - var thumbnailImage = ((value._thumbnailImage).replace('.jpg', '_' + userEthnicity + userModestysettings)) + '.jpg'; + var thumbnailImage; + if((value._id==1)||(value._id==3)|| (value._id==5)||(value._id==6)||(value._id==7)||(value._id==11)) + thumbnailImage = ((value._thumbnailImage).replace('.jpg', '_' + userEthnicity + userModestysettings)) + '.jpg'; + else { + thumbnailImage = ((value._thumbnailImage).replace('.jpg', '_' + userEthnicity)) + '.jpg'; + + } + $scope.imagePath = "http://localhost/AIA/content/images/DA/BodyViews/" + value._id + '/skintone/' + userEthnicity + '/' + thumbnailImage; - $scope.isImageExists = $scope.checkImgExistance($scope.imagePath); - //debugger + //$scope.isImageExists = $scope.checkImgExistance($scope.imagePath); + ////debugger - if ($scope.isImageExists == false) { - $scope.imagePath = ($scope.imagePath).replace($scope.userModestySetting, ""); - } + //if ($scope.isImageExists == false) { + // $scope.imagePath = ($scope.imagePath).replace($scope.userModestySetting, ""); + //} //debugger var $el = $('
' @@ -94,6 +101,8 @@ function ($scope, $compile,$http, $log, $location, $timeout,DA,$routeParam ) { $scope.openView = function ($event) { alert('clicked: ' + $event.currentTarget.id) + $rootScope.pageToOpen = 'app/views/da/da-view.html'; + alert($rootScope.pageToOpen) } diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js new file mode 100644 index 0000000..2b6426e --- /dev/null +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js @@ -0,0 +1,11 @@ +'use strict'; + +AIA.controller("HomeController", ["$rootScope", "$log", "$location", "$timeout", + function ($rootScope, $log, $location, $timeout) { + + //$scope.pageToOpen = { + // name: 'MainMenu' + //}; + $rootScope.pageToOpen = 'MainMenu.html'; + }] +); \ 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 7babac7..a51ca6f 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js @@ -22,7 +22,13 @@ AIA.constant('pages', [ pageSlug: 'da-body-view/:bodyViewId', pageUrl: 'app/views/da/da-body-view.html', pageController: 'DAController' - } + }, + { + name: 'index', + pageSlug: 'index', + pageUrl: 'index.html', + pageController: 'HomeController' + }, ]); diff --git a/400-SOURCECODE/AIAHTML5.Web/content/css/main.css b/400-SOURCECODE/AIAHTML5.Web/content/css/main.css index 041710f..5198103 100644 --- a/400-SOURCECODE/AIAHTML5.Web/content/css/main.css +++ b/400-SOURCECODE/AIAHTML5.Web/content/css/main.css @@ -399,7 +399,7 @@ footer.dark { /*overflow: hidden;*/ position: fixed; left: 0; - top: 0; + top: 100; z-index: 1029; } .tools { diff --git a/400-SOURCECODE/AIAHTML5.Web/index.html b/400-SOURCECODE/AIAHTML5.Web/index.html index ceef840..14457c6 100644 --- a/400-SOURCECODE/AIAHTML5.Web/index.html +++ b/400-SOURCECODE/AIAHTML5.Web/index.html @@ -28,7 +28,7 @@ - +
@@ -53,7 +53,9 @@
-
+ +
+