From ab5d8b3f39157fc90f11a2ee764ba4a11b783f12 Mon Sep 17 00:00:00 2001 From: nikita Date: Fri, 15 Apr 2016 18:12:57 +0530 Subject: [PATCH] changes in appearance as per prototype --- 400-SOURCECODE/AIAHTML5.API/AIAHTML5.API.csproj | 3 +-- 400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj | 6 ++---- 400-SOURCECODE/AIAHTML5.Web/MainMenu.html | 2 +- 400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js | 28 ++++++++++++++-------------- 400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html | 96 +++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------- 400-SOURCECODE/AIAHTML5.Web/content/css/main.css | 10 +++++----- 400-SOURCECODE/AIAHTML5.Web/libs/jquery/jquery_plugin/jsPanel/jspanel/jquery.jspanel.css | 4 ++-- 400-SOURCECODE/AIAHTML5.Web/libs/jquery/jquery_plugin/jsPanel/jspanel/jquery.jspanel.min.css | 2 +- 400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/bootstrap.css | 2 +- 400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css | 17 +++++++++-------- 10 files changed, 85 insertions(+), 85 deletions(-) diff --git a/400-SOURCECODE/AIAHTML5.API/AIAHTML5.API.csproj b/400-SOURCECODE/AIAHTML5.API/AIAHTML5.API.csproj index 671cf14..160b365 100644 --- a/400-SOURCECODE/AIAHTML5.API/AIAHTML5.API.csproj +++ b/400-SOURCECODE/AIAHTML5.API/AIAHTML5.API.csproj @@ -114,8 +114,7 @@ http://localhost/AIA/API False False - - + http://182.19.10.91/AIAHTML5 False diff --git a/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj b/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj index cd311e4..33eda27 100644 --- a/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj +++ b/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj @@ -10232,8 +10232,7 @@ - - + @@ -10256,8 +10255,7 @@ http://localhost/AIA False False - - + http://182.19.10.91/AIAHTML5 False diff --git a/400-SOURCECODE/AIAHTML5.Web/MainMenu.html b/400-SOURCECODE/AIAHTML5.Web/MainMenu.html index 3b27f98..32cdc90 100644 --- a/400-SOURCECODE/AIAHTML5.Web/MainMenu.html +++ b/400-SOURCECODE/AIAHTML5.Web/MainMenu.html @@ -8,7 +8,7 @@
    -
  • Dissectible Anatomy
    • +
  • Dissectible Anatomy
  • Atlas Anatomy
  • 3D Anatomy
  • Clinical Illustrations
    • diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 029c8a3..8c5444f 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -53,7 +53,7 @@ function ($scope,$rootScope, $compile,$http, $log, $location, $timeout,DA,$route } - $scope.imagePath = "http://localhost/AIA/content/images/DA/BodyViews/" + value._id + '/skintone/' + userEthnicity + '/' + thumbnailImage; + $scope.imagePath = "~/../content/images/DA/BodyViews/" + value._id + '/skintone/' + userEthnicity + '/' + thumbnailImage; var $el = $('
    ' @@ -104,7 +104,7 @@ function ($scope,$rootScope, $compile,$http, $log, $location, $timeout,DA,$route $scope.loadDissectibleAnatomyData = function () { //load bodyView data - $http({ method: 'GET', url: 'http://localhost/AIA/content/data/json/da_dat_contentlist.json' }).success(function (data) { + $http({ method: 'GET', url: '~/../content/data/json/da_dat_contentlist.json' }).success(function (data) { $scope.BodyViewData = data; //load default body view list for male @@ -117,7 +117,7 @@ function ($scope,$rootScope, $compile,$http, $log, $location, $timeout,DA,$route //load body region data - //$http({ method: 'GET', url: 'http://localhost/AIA/content/data/json/da_dat_brview.json' }).success(function (data) { + //$http({ method: 'GET', url: '~/../content/data/json/da_dat_brview.json' }).success(function (data) { // debugger; // $scope.BodyRegionData = data; // console.log($scope.BodyRegionData); @@ -130,7 +130,7 @@ function ($scope,$rootScope, $compile,$http, $log, $location, $timeout,DA,$route $('#daLoaderLabel').css('visibility', 'hidden') - $http({ method: 'GET', url: 'http://localhost/AIA/content/data/json/da_dat_tm_sg_1.json' }).success(function (data) { + $http({ method: 'GET', url: '~/../content/data/json/da_dat_tm_sg_1.json' }).success(function (data) { $scope.TermNumberData = data; }) @@ -140,7 +140,7 @@ function ($scope,$rootScope, $compile,$http, $log, $location, $timeout,DA,$route //load vocabterm data - $http({ method: 'GET', url: 'http://localhost/AIA/content/data/json/cm_dat_vocabterm_1.json' }).success(function (data) { + $http({ method: 'GET', url: '~/../content/data/json/cm_dat_vocabterm_1.json' }).success(function (data) { $scope.VocabTermData = data; }) .error(function (data, status, headers, config) { @@ -164,12 +164,12 @@ function ($scope,$rootScope, $compile,$http, $log, $location, $timeout,DA,$route // bootstrap: 'columns large-10 medium-9', position: { top: 70, //50, - left: 110, + left: 0, // right: 0 }, //overflow: { horizontal: 'scroll', vertical: 'scroll' }, - size: { width: $(window).outerWidth() - 110, height: $(window).outerHeight()-110 }, + size: { width: $(window).outerWidth() , height: $(window).outerHeight()-110 }, //size: { width: 500, height: 500 }, }); @@ -195,7 +195,7 @@ function ($scope,$rootScope, $compile,$http, $log, $location, $timeout,DA,$route $scope.LoadDefaultLayerImage = function () { // debugger; - $http({ method: 'GET', url: 'http://localhost/AIA/content/data/json/da_dat_brview.json' }).success(function (data) { + $http({ method: 'GET', url: '~/../content/data/json/da_dat_brview.json' }).success(function (data) { // debugger; $scope.BodyRegionData = data; console.log($scope.BodyRegionData); @@ -206,7 +206,7 @@ function ($scope,$rootScope, $compile,$http, $log, $location, $timeout,DA,$route // Load Layer data - $http({ method: 'GET', url: 'http://localhost/AIA/content/data/json/da_dat_layer_1.json' }).success(function (data) { + $http({ method: 'GET', url: '~/../content/data/json/da_dat_layer_1.json' }).success(function (data) { // debugger $scope.BodyLayerData = data; console.log($scope.BodyLayerData); @@ -235,7 +235,7 @@ function ($scope,$rootScope, $compile,$http, $log, $location, $timeout,DA,$route $('#canvasDiv').css('height', $('#daImagePanel').outerHeight() - 134) //$('#canvasDiv').css('width', $('#daImagePanel').outerWidth() - 100) - $('#leftToolBar').css('height', $('#daImagePanel').outerHeight() - 124) + $('#leftToolBar').css('height', $('#daImagePanel').outerHeight() ) @@ -549,8 +549,8 @@ function ($scope,$rootScope, $compile,$http, $log, $location, $timeout,DA,$route var img = new Image(); img.onload = start; - img.src = "http://localhost/AIA/" + src;; - // img.src = "http://localhost/AIAHtml/" + src; + // img.src = "~/../content/images/" + src;; + img.src = src; console.log("img.src: " + img.src); console.log("src: " + src); @@ -681,8 +681,8 @@ function ($scope,$rootScope, $compile,$http, $log, $location, $timeout,DA,$route var img = new Image(); img.onload = start; - // img.src = "http://localhost/AIAHtml/" + src; - img.src = img.src = "http://localhost/AIA/" + src; + img.src = src; + // img.src = img.src = "~/../content/images/" + src; console.log("img.src: " + img.src); console.log("src: " + src); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html index db8ecca..7c7670b 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html @@ -1,27 +1,27 @@ 
    -
    +
    -
    +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    @@ -69,49 +69,50 @@
    -
    -
    -
    -
    -
    -
    - -
    -   -
    - - -
    -
    - -
      -
      • -
    + +
    +
    +
    +
    +
    + +
    +   +
    + + +
    +
    + +
      +
      • +
    +
    -
    -
    -
    -
    - -
    -
    Loading....
    +
    +
    +
    + +
    +
    Loading....
    +
    +
    -
    +
    -
    - + +