Commit 24bbf68fad2881ca2339f604504858e55370ab4c
1 parent
33a30137
test
Showing
4 changed files
with
6 additions
and
5 deletions
400-SOURCECODE/AIAHTML5.Web/Web.config
| @@ -40,7 +40,7 @@ | @@ -40,7 +40,7 @@ | ||
| 40 | <!--<clientCache cacheControlMode="DisableCache" />--> | 40 | <!--<clientCache cacheControlMode="DisableCache" />--> |
| 41 | <remove fileExtension=".woff" /> | 41 | <remove fileExtension=".woff" /> |
| 42 | <mimeMap fileExtension=".woff" mimeType="application/font-woff" /> | 42 | <mimeMap fileExtension=".woff" mimeType="application/font-woff" /> |
| 43 | - <mimeMap fileExtension=".json" mimeType="application/json" /> | 43 | + <!--<mimeMap fileExtension=".json" mimeType="application/json" />--> |
| 44 | <mimeMap fileExtension=".mp3" mimeType="audio/mpeg" /> | 44 | <mimeMap fileExtension=".mp3" mimeType="audio/mpeg" /> |
| 45 | <mimeMap fileExtension=".vtt" mimeType="text/vtt"/> | 45 | <mimeMap fileExtension=".vtt" mimeType="text/vtt"/> |
| 46 | <!--<mimeMap fileExtension=".woff2" mimeType="application/font-woff2" />--> | 46 | <!--<mimeMap fileExtension=".woff2" mimeType="application/font-woff2" />--> |
400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
| @@ -81,7 +81,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location | @@ -81,7 +81,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location | ||
| 81 | $scope.LabExerciseModules = null; | 81 | $scope.LabExerciseModules = null; |
| 82 | $scope.LabExerciseBoxes = null; | 82 | $scope.LabExerciseBoxes = null; |
| 83 | //alert($scope.LabExerciseName) | 83 | //alert($scope.LabExerciseName) |
| 84 | - var labExerciseModulePath = '~/../content/data/json/le/' + $scope.LabExerciseName + '.json'; | 84 | + var labExerciseModulePath = 'content/data/json/le/' + $scope.LabExerciseName + '.json'; |
| 85 | 85 | ||
| 86 | DataService.getAnotherJson(labExerciseModulePath).then( | 86 | DataService.getAnotherJson(labExerciseModulePath).then( |
| 87 | function (result) { | 87 | function (result) { |
| @@ -107,6 +107,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location | @@ -107,6 +107,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location | ||
| 107 | $scope.Title = result.LabExercise[index].Questions[index1].Title; | 107 | $scope.Title = result.LabExercise[index].Questions[index1].Title; |
| 108 | } | 108 | } |
| 109 | else { | 109 | else { |
| 110 | + alert(result.LabExercise[index].Questions[index1].ImagePath); | ||
| 110 | $("#imgblock").css("display", "block"); | 111 | $("#imgblock").css("display", "block"); |
| 111 | $scope.IsVisible = true; | 112 | $scope.IsVisible = true; |
| 112 | $("#textblock").css("display", "none"); | 113 | $("#textblock").css("display", "none"); |
400-SOURCECODE/AIAHTML5.Web/app/views/LabExerc/lab-exercises-detail.html
| @@ -40,7 +40,7 @@ | @@ -40,7 +40,7 @@ | ||
| 40 | <div class="col-sm-9"> | 40 | <div class="col-sm-9"> |
| 41 | <div style="position: relative; margin-left: 85px;" id="imgdiv"> | 41 | <div style="position: relative; margin-left: 85px;" id="imgdiv"> |
| 42 | <div id="imgblock"> | 42 | <div id="imgblock"> |
| 43 | - <img id="droppable" ng-src="content/images/LE/{{Imagepath}}" alt="" ng-click="onClick()" imageonload /> | 43 | + <img id="droppable" ng-src="content/images/le/{{Imagepath}}" alt="" ng-click="onClick()" imageonload /> |
| 44 | </div> | 44 | </div> |
| 45 | 45 | ||
| 46 | <div ng-show="IsVisible" ng-repeat="optionbox in LabExerciseModules.OptionBox" droppable="true" class="droppable ui-droppable options" id="blockbox-{{optionbox.BoxName}}" ng-style="{'top':{{optionbox.topcoord}}, 'left':{{optionbox.leftcoord}},'position': 'absolute', 'width': '155px', 'height':'30px', 'border':'0px solid #333', 'background': '#E8E8E8' }">{{optionbox.Answervalue}}</div> | 46 | <div ng-show="IsVisible" ng-repeat="optionbox in LabExerciseModules.OptionBox" droppable="true" class="droppable ui-droppable options" id="blockbox-{{optionbox.BoxName}}" ng-style="{'top':{{optionbox.topcoord}}, 'left':{{optionbox.leftcoord}},'position': 'absolute', 'width': '155px', 'height':'30px', 'border':'0px solid #333', 'background': '#E8E8E8' }">{{optionbox.Answervalue}}</div> |
400-SOURCECODE/AIAHTML5.Web/index.html
| @@ -2,8 +2,8 @@ | @@ -2,8 +2,8 @@ | ||
| 2 | <html lang="en" ng-cloak ng-app="AIA"> | 2 | <html lang="en" ng-cloak ng-app="AIA"> |
| 3 | <head> | 3 | <head> |
| 4 | <!--<base href="/AIAHTML5/" />--> | 4 | <!--<base href="/AIAHTML5/" />--> |
| 5 | - <base href="/AIA/" /> | ||
| 6 | - <!--<base href="/" />--> | 5 | + <!--<base href="/AIA/" />--> |
| 6 | + <base href="/" /> | ||
| 7 | <meta charset="utf-8"> | 7 | <meta charset="utf-8"> |
| 8 | <meta http-equiv="X-UA-Compatible" content="IE=edge"> | 8 | <meta http-equiv="X-UA-Compatible" content="IE=edge"> |
| 9 | <!--<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">--> | 9 | <!--<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">--> |