Commit df9cc2d54bb9681306e0eb63c41b00b40be8b381
update new change from develop
Showing
6 changed files
with
76 additions
and
196 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/AIController.js
... | ... | @@ -21,85 +21,11 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
21 | 21 | localStorage.setItem("ImageCount", Count); |
22 | 22 | var searchByText = $rootScope.getLocalStorageValue("SearchText"); |
23 | 23 | var searchTextByAlphabet = $rootScope.getLocalStorageValue("SearchByAlphabet"); |
24 | - var SelectCurrTab = $rootScope.getLocalStorageValue("currentAITabView"); | |
25 | - | |
26 | - //Commented by sandeep for fixed bugs related to ADAM Images | |
27 | - //$timeout(function () { | |
28 | - // $("#ListViewDiv").on('scroll', function () { | |
29 | - | |
30 | - // var searchByText = $rootScope.getLocalStorageValue("SearchText"); | |
31 | - // var searchTextByAlphabet = $rootScope.getLocalStorageValue("SearchByAlphabet"); | |
32 | - // var SelectCurrTab = $rootScope.getLocalStorageValue("currentAITabView"); | |
33 | - // if ($scope.query.SelectedDiv == 2) { | |
34 | - | |
35 | - // if ($(this).scrollTop() + $(this).innerHeight() >= $(this)[0].scrollHeight - 10) { | |
36 | - // Count += 100; | |
37 | - // //$(window).scrollTop(0); | |
38 | - // var ImageCount = $rootScope.getLocalStorageValue("ImageCount"); | |
39 | - // if (typeof (searchByText) !== "undefined" && searchByText !== null && searchByText !== '') { | |
40 | - // $scope.query.SearchText = searchByText; | |
41 | - // } | |
42 | - // else if (typeof (searchTextByAlphabet) !== "undefined" && searchTextByAlphabet !== null && searchTextByAlphabet !== '') { | |
43 | - // $scope.query.SearchTextByAlphabet = searchTextByAlphabet; | |
44 | - // } | |
45 | - // else { | |
46 | - // $scope.query.SearchTextByAlphabet = ""; | |
47 | - // } | |
48 | - | |
49 | - // if ($scope.query.SearchText == "" && $scope.query.SearchTextByAlphabet == "") { | |
50 | - | |
51 | - // $scope.LoadAIJsonData(Count); | |
52 | - // $scope.loadAllAI(Count); | |
53 | - // } | |
54 | - // else if ($scope.query.SearchTextByAlphabet != "" || $scope.query.SearchText == "") { | |
55 | - // $scope.ApplySearchByAlphabet($scope.query.SearchTextByAlphabet); | |
56 | - // } | |
57 | - // else { | |
58 | - // $scope.ApplySearch($scope.query); | |
59 | - // } | |
60 | - // } | |
61 | - // } | |
62 | - // }); | |
63 | - | |
64 | - //}, 10); | |
65 | - | |
66 | - //$(window).scroll(function () { | |
67 | - // var searchByText = $rootScope.getLocalStorageValue("SearchText"); | |
68 | - // var searchTextByAlphabet = $rootScope.getLocalStorageValue("SearchByAlphabet"); | |
69 | - // var SelectCurrTab = $rootScope.getLocalStorageValue("currentAITabView"); | |
70 | - // if ($scope.query.SelectedDiv == 1) { | |
71 | - | |
72 | - // if ($(window).scrollTop() == $(document).height() - $(window).height()) { | |
73 | - // Count += 100; | |
74 | - // var ImageCount = $rootScope.getLocalStorageValue("ImageCount"); | |
75 | - // if (typeof (searchByText) !== "undefined" && searchByText !== null && searchByText !== '') { | |
76 | - // $scope.query.SearchText = searchByText; | |
77 | - // } | |
78 | - // else if (typeof (searchTextByAlphabet) !== "undefined" && searchTextByAlphabet !== null && searchTextByAlphabet !== '') { | |
79 | - // $scope.query.SearchTextByAlphabet = searchTextByAlphabet; | |
80 | - // } | |
81 | - // else { | |
82 | - // $scope.query.SearchTextByAlphabet = ""; | |
83 | - // } | |
84 | - | |
85 | - // if ($scope.query.SearchText == "" && $scope.query.SearchTextByAlphabet == "") { | |
86 | - | |
87 | - // $scope.LoadAIJsonData(Count); | |
88 | - // $scope.loadAllAI(Count); | |
89 | - // } | |
90 | - // else if ($scope.query.SearchTextByAlphabet != "" || $scope.query.SearchText == "") { | |
91 | - // $scope.ApplySearchByAlphabet($scope.query.SearchTextByAlphabet); | |
92 | - // } | |
93 | - // else { | |
94 | - // $scope.ApplySearch($scope.query); | |
95 | - // } | |
96 | - // } | |
97 | - // } | |
98 | - //}); | |
24 | + var SelectCurrTab = $rootScope.getLocalStorageValue("currentAITabView"); | |
99 | 25 | |
100 | - | |
26 | + //Modified code by sandeep for fixed Bugs of ADAM Images | |
101 | 27 | $scope.setActiveTab = function (tabToSet, inderectCall) { |
102 | - //Modified code by sandeep for fixed Bugs of ADAM Images | |
28 | + | |
103 | 29 | $scope.activeTab = tabToSet; |
104 | 30 | localStorage.setItem("currentAITabView", ""); |
105 | 31 | localStorage.setItem("currentAITabView", $scope.activeTab); |
... | ... | @@ -139,14 +65,12 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
139 | 65 | $scope.filterstring = false; |
140 | 66 | $scope.showItem(selectedImageId); |
141 | 67 | $scope.filterstring = true; |
142 | - } | |
143 | - //$scope.ReloadListViewImageDiv(curSelectedRowId, ImageCount); | |
68 | + } | |
144 | 69 | } |
145 | 70 | } |
146 | - else { | |
147 | - //ReloadListViewImageDiv(curSelectedRowId, ImageCount); | |
148 | - $scope.loadAllAI(ImageCount); | |
149 | - if (inderectCall == true) { | |
71 | + else { | |
72 | + $scope.loadAllAI(ImageCount); | |
73 | + if (inderectCall == true) { | |
150 | 74 | if (curSelectedRowId != "") { |
151 | 75 | $scope.filterstring = true; |
152 | 76 | $scope.showItem(curSelectedRowId); |
... | ... | @@ -156,13 +80,11 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
156 | 80 | if (selectedImageId != "") { |
157 | 81 | $scope.filterstring = false; |
158 | 82 | $scope.showItem(selectedImageId); |
159 | - } | |
160 | - //$scope.ReloadListViewImageDiv(curSelectedRowId, ImageCount); | |
83 | + } | |
161 | 84 | } |
162 | 85 | } |
163 | 86 | $scope.query.SelectedDiv = tabToSet; |
164 | - //Method call for set position for selected title Bug-57978 | |
165 | - //$scope.ReloadListViewImageDiv(curSelectedRowId, ImageCount); | |
87 | + //Method call for set position for selected title Bug-57978 | |
166 | 88 | $('#grid-view').css("display", "none"); |
167 | 89 | $('#list-view').css("display", "block"); |
168 | 90 | } |
... | ... | @@ -191,60 +113,14 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
191 | 113 | }, 100); |
192 | 114 | |
193 | 115 | }; |
194 | - | |
195 | - | |
196 | - //$scope.loadAIModuleById = function (moduleId) { | |
197 | - | |
198 | - // var ImageCount = $rootScope.getLocalStorageValue("ImageCount"); | |
199 | - | |
200 | - // if ($rootScope.refreshcheck == null) { | |
201 | - // $location.path('/'); | |
202 | - // } | |
203 | - | |
204 | - // // code that will be executed ... | |
205 | - // // every time this view is loaded | |
206 | - | |
207 | - // //get current path | |
208 | - // var currentURL = $location.path(); | |
209 | - // var selectedModuleName = ''; | |
210 | - // //set module title | |
211 | - // angular.forEach($rootScope.userModules, function (value, key) { | |
212 | - // if (value.slug === currentURL.replace('/', '')) { | |
213 | - // selectedModuleName = value.name; | |
214 | - // } | |
215 | - // $rootScope.currentActiveModuleTitle = selectedModuleName; | |
216 | - // }) | |
217 | - | |
218 | - // $scope.LoadAIJsonData(ImageCount); | |
219 | - // $scope.scroll(); | |
220 | - // //push the details of open module in array $rootScope.openModules | |
221 | - // $rootScope.openModules.push({ "ModuleId": 13 }); | |
222 | - | |
223 | - // //set the local storage | |
224 | - // var curtab = $rootScope.getLocalStorageValue("currentAITabView"); | |
225 | - // var inderectCall = true; | |
226 | - // if (curtab == 2) { | |
227 | - // $scope.setActiveTab(2, inderectCall); | |
228 | - // var curSelectedRowId = $rootScope.getLocalStorageValue("AISelectedRowId"); | |
229 | - // if (typeof (curSelectedRowId) !== "undefined" && curSelectedRowId !== null && curSelectedRowId !== '') { | |
230 | - // $scope.reRunSearchOnLoad(); | |
231 | - // $scope.idSelected = curSelectedRowId; | |
232 | - // $scope.ReloadListViewImageDiv($scope.idSelected, ImageCount); | |
233 | - // } | |
234 | - // else { | |
235 | - // $scope.reRunSearchOnLoad() | |
236 | - // $scope.idSelected = ''; | |
237 | - // } | |
238 | - // } | |
239 | - // else { | |
240 | - // $scope.setActiveTab(1, inderectCall); | |
241 | - // $scope.reRunSearchOnLoad(); | |
242 | - | |
243 | - // } | |
244 | - //} | |
245 | - | |
116 | + | |
246 | 117 | $scope.loadAIModuleById = function (moduleId) { |
247 | - | |
118 | + | |
119 | + if ($rootScope.checkRefreshButtonClick == 1) { | |
120 | + var query = $scope.query; | |
121 | + $scope.Reset(query); | |
122 | + $rootScope.checkRefreshButtonClick = 0; | |
123 | + } | |
248 | 124 | var ImageCount = $rootScope.getLocalStorageValue("ImageCount"); |
249 | 125 | |
250 | 126 | if ($rootScope.refreshcheck == null) { |
... | ... | @@ -309,10 +185,10 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
309 | 185 | $scope.query.SearchTextByAlphabet = ""; |
310 | 186 | } |
311 | 187 | |
312 | - if ($scope.query.SearchText == "" && $scope.query.SearchTextByAlphabet == "") { | |
188 | + //if ($scope.query.SearchText == "" && $scope.query.SearchTextByAlphabet == "") { | |
313 | 189 | |
314 | - $scope.loadAllAI(ImageCount); | |
315 | - } | |
190 | + // $scope.loadAllAI(ImageCount); | |
191 | + //} | |
316 | 192 | |
317 | 193 | } |
318 | 194 | |
... | ... | @@ -353,12 +229,11 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
353 | 229 | $scope.selectedAIListViewData = new jinqJs() |
354 | 230 | .from($scope.IllustrationData.root.AIData) |
355 | 231 | .orderBy([{ field: '_Title', sort: 'asc' }]) |
356 | - .select().slice(0, ImageCount); | |
232 | + //.select().slice(0, ImageCount); | |
233 | + .select(); //Fixed Bug-58419 by Sandeep | |
357 | 234 | |
358 | 235 | //console.log($scope.selectedAIListViewData); |
359 | 236 | |
360 | - | |
361 | - | |
362 | 237 | $('#grid-view').empty(); |
363 | 238 | var $e1 = $('<ul><li ng-repeat="value in selectedAIListViewData" class="col-sm-3 col-md-2"><div id="{{value._id}}" title = "{{value._Title}}" class="GridViewDataDivHeight" data-ng-click="OpenAdamImage($event)">' |
364 | 239 | + '<div class="thumbnail" >' |
... | ... | @@ -382,7 +257,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
382 | 257 | }, 10); |
383 | 258 | } |
384 | 259 | |
385 | - | |
386 | 260 | }, |
387 | 261 | function (error) { |
388 | 262 | // handle errors here |
... | ... | @@ -440,14 +314,27 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
440 | 314 | } |
441 | 315 | }; |
442 | 316 | |
317 | + //Code changes by Sandeep for fixed bug-57854 | |
443 | 318 | $scope.Reset = function (query) { |
444 | 319 | $('ul li span').removeAttr("style"); |
445 | 320 | query.SearchText = ""; |
446 | 321 | $scope.idSelected = ''; |
322 | + $scope.hideListViewDiv(); | |
447 | 323 | //set localstorage values |
448 | 324 | localStorage.setItem("SearchText", ''); |
449 | 325 | localStorage.setItem("SearchByAlphabet", ''); |
450 | 326 | localStorage.setItem("AIListViewScroll", ''); |
327 | + localStorage.setItem("AIGridViewScroll", ''); | |
328 | + localStorage.setItem("currentAITabView", ''); | |
329 | + localStorage.setItem("AIListViewScrollPosition", ''); | |
330 | + localStorage.setItem("AISelectedRowId", ''); | |
331 | + localStorage.setItem("currentAIImageId", ''); | |
332 | + localStorage.setItem("listViewSelectedID", ''); | |
333 | + localStorage.setItem("AIGridViewHighlightThumbnail", ''); | |
334 | + localStorage.setItem("currentViewTitle", ''); | |
335 | + localStorage.setItem("currentImageTitleFromJson", ''); | |
336 | + //localStorage.setItem("", ''); | |
337 | + //localStorage.setItem("", ''); | |
451 | 338 | var ImageCount = $rootScope.getLocalStorageValue("ImageCount"); |
452 | 339 | if ($('.selected').hasClass("selected")) { |
453 | 340 | $('.selected').removeClass("selected"); |
... | ... | @@ -455,13 +342,13 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
455 | 342 | |
456 | 343 | $('#ListViewDiv').scrollTop(0); |
457 | 344 | |
458 | - $scope.hideListViewDiv(); | |
345 | + //$scope.hideListViewDiv(); | |
459 | 346 | |
460 | 347 | $scope.filterstring = false; |
461 | 348 | while ($scope.searchAIListViewData.length) { |
462 | 349 | $scope.searchAIListViewData.pop(); |
463 | 350 | } |
464 | - $scope.loadAllAI(ImageCount); | |
351 | + //$scope.loadAllAI(ImageCount); | |
465 | 352 | } |
466 | 353 | |
467 | 354 | $scope.ApplySearch = function (query) { |
... | ... | @@ -612,6 +499,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
612 | 499 | if (AIListViewScroll !== null && $location.url() == "/ADAM-images" && AIListViewScroll != "0") { |
613 | 500 | $('#ListViewDiv').animate({ scrollTop: $rootScope.getLocalStorageValue('AIListViewScrollPosition') }, 'slow'); |
614 | 501 | } |
502 | + //if (_currentImgId != "null" && _currentImgId != null) { | |
503 | + // $('html, body').animate({ scrollTop: _currentImgId }, 'slow'); | |
504 | + //} | |
615 | 505 | else if (aISelectedRowId != "null" && aISelectedRowId != null) { |
616 | 506 | $('html, body').animate({ scrollTop: $('#' + aISelectedRowId).position().top }, 100); |
617 | 507 | } |
... | ... | @@ -827,30 +717,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
827 | 717 | size: { width: $(window).outerWidth() - 30, height: $(window).outerHeight() - 125 }, |
828 | 718 | |
829 | 719 | }); |
830 | - | |
831 | - //$('#canvasDiv img').load(function () { | |
832 | - | |
833 | - // $rootScope.isLoading = false; | |
834 | - // $('#aiSpinner').css('visibility', 'hidden'); | |
835 | - // var canvas = document.getElementById("canvas"); | |
836 | - // var canvasPaint = document.getElementById("canvasPaint"); | |
837 | - | |
838 | - // var imageheight = $("#aimage").height(); | |
839 | - // var canvasDivheight = $(window).outerHeight() - 150; | |
840 | - | |
841 | - // if (canvasDivheight > imageheight) { | |
842 | - // canvas.height = canvasDivheight; | |
843 | - // canvasPaint.height = canvasDivheight; | |
844 | - // } | |
845 | - // else { | |
846 | - // canvas.height = imageheight; | |
847 | - // canvasPaint.height = imageheight; | |
848 | - // } | |
849 | - | |
850 | - // canvas.width = $(window).outerWidth() - 81; | |
851 | - // canvasPaint.width = $(window).outerWidth() - 81; | |
852 | - | |
853 | - //}); | |
720 | + | |
854 | 721 | $('#canvasDiv img').load(function () { |
855 | 722 | $rootScope.isLoading = false; |
856 | 723 | $('#aiSpinner').css('visibility', 'hidden'); |
... | ... | @@ -932,7 +799,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
932 | 799 | |
933 | 800 | //Set the scroll position of the tablebody to show selected row |
934 | 801 | |
935 | - $scope.setImgPosition(); | |
802 | + //$scope.setImgPosition(); | |
936 | 803 | |
937 | 804 | $rootScope.isLoading = false; |
938 | 805 | $('#aiSpinner').css('visibility', 'hidden'); | ... | ... |
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
... | ... | @@ -147,10 +147,8 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A |
147 | 147 | $("#messageModal").modal('show'); |
148 | 148 | |
149 | 149 | } |
150 | - | |
151 | - $scope.helpTopicLink=function() | |
152 | - { | |
153 | - var dd = $("#helplinkId").html(); | |
150 | + | |
151 | + $scope.helpTopicLink = function () { | |
154 | 152 | var absurl = $location.absUrl(); |
155 | 153 | var hTopicUrl = absurl + "content/help/index.html"; |
156 | 154 | var aboutADAM = absurl + "content/help/about/Adam_Credits_AIA5.html"; |
... | ... | @@ -163,7 +161,9 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A |
163 | 161 | } |
164 | 162 | |
165 | 163 | $rootScope.initializeAIA = function () { |
166 | - | |
164 | + | |
165 | + $rootScope.checkRefreshButtonClick = 1; | |
166 | + | |
167 | 167 | if (params != null && params != undefined && params != "") { |
168 | 168 | |
169 | 169 | $scope.ValidateClientSiteUrl(); |
... | ... | @@ -220,11 +220,11 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A |
220 | 220 | |
221 | 221 | $rootScope.getConfigurationValues(); |
222 | 222 | } |
223 | + | |
223 | 224 | $timeout(function () { |
224 | 225 | |
225 | 226 | $scope.helpTopicLink(); |
226 | 227 | }, 2000); |
227 | - | |
228 | 228 | |
229 | 229 | |
230 | 230 | } |
... | ... | @@ -1402,9 +1402,9 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A |
1402 | 1402 | $rootScope.PrintPreview = "PrintPreview"; |
1403 | 1403 | $rootScope.exportImage = "exportImage"; |
1404 | 1404 | $rootScope.PrintViewer = "PrintViewer"; |
1405 | - $rootScope.newCurriculum = "newCurriculum"; | |
1406 | - $rootScope.openCurriculum = "openCurriculum"; | |
1407 | - $rootScope.saveCurriculam = "saveCurriculam"; | |
1405 | + $rootScope.newCurriculum = ""; | |
1406 | + $rootScope.openCurriculum = ""; | |
1407 | + $rootScope.saveCurriculam = ""; | |
1408 | 1408 | |
1409 | 1409 | } |
1410 | 1410 | else if ($location.url() == "/adam-images-detail") { | ... | ... |
400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
... | ... | @@ -129,6 +129,17 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter, |
129 | 129 | $scope.LabExerciseName = keywords.labexercise; |
130 | 130 | $scope.LabExerciseModules = null; |
131 | 131 | $scope.LabExerciseBoxes = null; |
132 | + | |
133 | + if ($scope.quiznumber == 1) { | |
134 | + $("#btnBackward").css('pointer-events', 'none'); | |
135 | + } | |
136 | + else if ($scope.quiznumber == $scope.TotalNumberofQuiz) { | |
137 | + $("#btnForward").css('pointer-events', 'none'); | |
138 | + } | |
139 | + else { | |
140 | + $("#btnBackward").css('pointer-events', 'auto'); | |
141 | + $("#btnForward").css('pointer-events', 'auto'); | |
142 | + } | |
132 | 143 | |
133 | 144 | //alert($scope.LabExerciseName) |
134 | 145 | var labExerciseModulePath = '~/../content/data/json/le/' + $scope.LabExerciseName + '.json'; |
... | ... | @@ -1384,12 +1395,12 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter, |
1384 | 1395 | |
1385 | 1396 | // email validation code |
1386 | 1397 | |
1387 | - var senderEmails = $("#emailTo").val().split(", "); | |
1398 | + var senderEmails = $("#emailTo").val().split(","); | |
1388 | 1399 | $scope.isSenderEmailValid = false; |
1389 | 1400 | for (var i = 0; i <= senderEmails.length - 1; i++) { |
1390 | 1401 | |
1391 | - var sEmail = senderEmails[i]; | |
1392 | - if ($.trim(sEmail).length == 0) { | |
1402 | + var sEmail = $.trim(senderEmails[i]); | |
1403 | + if (sEmail.length == 0) { | |
1393 | 1404 | //alert('*Email To email address is empty'); |
1394 | 1405 | $scope.isSenderEmailValid = false; |
1395 | 1406 | // event.preventDefault(); | ... | ... |
400-SOURCECODE/AIAHTML5.Web/app/views/LabExerc/lab-exercises-detail.html
... | ... | @@ -230,7 +230,9 @@ |
230 | 230 | |
231 | 231 | <div class="col-sm-12" style=" margin-top: 20px; min-height:100px;" id="divoptions" droppable="true"> |
232 | 232 | <!--<div class="col-sm-3 col-lg-3 ui-draggable" >--> |
233 | - <div draggable="true" ng-repeat="option in LabExerciseModules.Options" ng-style="{'width': '150px', 'height':'40px','font-size':'8px;','valign':'middle','text-align':'center', 'vertical-align:middle','background-color': '#808080','margin':'5px !important','float':'{{option.textalign}}'} " style="margin-bottom: 5px !important; width: 180px;" class="thumbnail caption col-sm-2 col-lg-3 ui-draggable marginR5 " id="block-{{option.OptionNumber}}">{{option.OptionTitle}}</div> | |
233 | + <!--<div draggable="true" ng-repeat="option in LabExerciseModules.Options" ng-style="{'width': '150px', 'height':'40px','font-size':'8px;','valign':'middle','text-align':'center', 'vertical-align:middle','background-color': '#808080','margin':'5px !important','float':'{{option.textalign}}'} " style="margin-bottom: 5px !important; width: 180px;" class="thumbnail caption col-sm-2 col-lg-3 ui-draggable marginR5 " id="block-{{option.OptionNumber}}">{{option.OptionTitle}}</div>--> | |
234 | + <div draggable="true" ng-repeat="option in LabExerciseModules.Options" style="margin-bottom: 5px !important; width: 180px; float: left" class="thumbnail caption col-sm-2 col-lg-3 ui-draggable marginR5 " id="block-{{option.OptionNumber}}">{{option.OptionTitle}}</div> | |
235 | + | |
234 | 236 | </div> |
235 | 237 | </div> |
236 | 238 | </div> |
... | ... | @@ -252,8 +254,8 @@ |
252 | 254 | <button class="btn btn-sm btn-primary" id="resetBtn" ng-click="OnResetClick()">Reset</button> |
253 | 255 | </div> |
254 | 256 | <div class="btn-group"> |
255 | - <button class="btn btn-sm btn-black" ng-click="prevQuiz()"><i class="fa fa-arrow-left"></i></button> | |
256 | - <button class="btn btn-sm btn-black" ng-click="nextQuiz()"><i class="fa fa-arrow-right"></i></button> | |
257 | + <button id="btnBackward" class="btn btn-sm btn-black" ng-click="prevQuiz()"><i class="fa fa-arrow-left"></i></button> | |
258 | + <button id="btnForward" class="btn btn-sm btn-black" ng-click="nextQuiz()"><i class="fa fa-arrow-right"></i></button> | |
257 | 259 | </div> |
258 | 260 | </div> |
259 | 261 | <div class="clearfix"></div> | ... | ... |
400-SOURCECODE/AIAHTML5.Web/app/views/ai/ai-view.html
... | ... | @@ -71,7 +71,7 @@ |
71 | 71 | </tr> |
72 | 72 | </tbody> |
73 | 73 | <tbody id="ListViewDiv" ng-if="filterstring" class="clstbody"> |
74 | - <tr ng-click="showItem(item._id)" ng-class="{selected: item._id === idSelected}" ng-dblclick="OpenAdamImage($event)" ng-repeat="item in searchAIListViewData"> | |
74 | + <tr id="{{item._id}}" ng-click="showItem(item._id)" ng-class="{selected: item._id === idSelected}" ng-dblclick="OpenAdamImage($event)" ng-repeat="item in searchAIListViewData"> | |
75 | 75 | <td width="20%"> |
76 | 76 | {{item._Title}} |
77 | 77 | </td> |
... | ... | @@ -84,7 +84,7 @@ |
84 | 84 | <div class="row well"> |
85 | 85 | <div title="{{SelectedAITitle}}" class="col-sm-3 col-lg-2 no-padding"> |
86 | 86 | <div class="thumbnail no-margin"> |
87 | - <img id="{{SelectedAIId}}" src="{{SelectedAIthumbImage}}" alt="" title="{{SelectedAITitle}}" data-ng-click="OpenAdamImage($event)"> | |
87 | + <img id="{{SelectedAIId}}" src="{{SelectedAIthumbImage}}" alt="" title="{{SelectedAITitle}}" data-ng-click="OpenAdamImage($event)"> | |
88 | 88 | </div> |
89 | 89 | </div> |
90 | 90 | <div class="col-sm-9 col-lg-9" style="padding-left:10px;"> | ... | ... |
400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html
... | ... | @@ -44,13 +44,13 @@ |
44 | 44 | <li class="dropdown navbarDropdownItem"> |
45 | 45 | <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Help<span class="caret"></span></a> |
46 | 46 | <ul class="dropdown-menu" id="helplinkId"> |
47 | - <!--<li><a href="http://interactiveanatomy.com/content/help/index.html" target="_blank">Help Topics</a></li>--> | |
48 | - <!--<li><a href="http://adameducation.com/Contact" target="_blank">Customer Support</a></li>--> | |
49 | - <!--<li role="separator" class="divider"></li>--> | |
50 | - <!-- <li><a href="http://interactiveanatomy.com/content/help/about/Adam_Credits_AIA5.html" target="_blank">About A.D.A.M.</a></li>--> | |
47 | + <!--<li><a href="http://interactiveanatomy.com/content/help/index.html" target="_blank">Help Topics</a></li> | |
48 | + <li><a href="http://adameducation.com/Contact" target="_blank">Customer Support</a></li> | |
49 | + <li role="separator" class="divider"></li> | |
50 | + <li><a href="http://interactiveanatomy.com/content/help/about/Adam_Credits_AIA5.html" target="_blank">About A.D.A.M.</a></li>--> | |
51 | 51 | </ul> |
52 | 52 | </li> |
53 | - <!--redirecting to Admin--> | |
53 | + <!--redirecting to Admin | |
54 | 54 | <li class="navbarItem"><a ng-click="reDirectURLToAdmin()" ng-show="haveRoleAdmin" style="cursor: pointer;">Admin</a></li> |
55 | 55 | </ul> |
56 | 56 | <ul class="nav navbar-nav navbar-right"> | ... | ... |