diff --git a/400-SOURCECODE/AIAHTML5.API/Web.config b/400-SOURCECODE/AIAHTML5.API/Web.config index 51437da..f7d8a30 100644 --- a/400-SOURCECODE/AIAHTML5.API/Web.config +++ b/400-SOURCECODE/AIAHTML5.API/Web.config @@ -39,7 +39,7 @@ - + diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js index ee466e7..15e560b 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js @@ -552,7 +552,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout ' kind="captions" srclang="en" label="On">' + ' ' + - ' Here we are

' + $scope.clickedCASummary + '

', + ' Here we are

' + $scope.clickedCASummary + '

', //ajax: { // url: 'app/views/ca/ca-view-detail.html' @@ -581,12 +581,12 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout var videoHeight = $('#divplayerinlineVideo div').height(); if (videoHeight <= 0) videoHeight = 360; - var textH = $('.well').height(); + var textH = $('.video-subtitle').height(); textH = textH + 40; var blackBorderHeight = jspContentHeight - (videoHeight + textH); if ($('.jsPanel-content').length > 0) { - $('.well').css('margin-bottom', blackBorderHeight); + $('.video-subtitle').css('margin-bottom', blackBorderHeight); $('#divplayerinlineVideo').css('background', '#fff'); } diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js index 9ea57b8..b8d6bff 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js @@ -158,7 +158,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout }; $scope.loadAllCI = function () { - + $('#ciSpinner').css('visibility', 'visible'); + $('#ciSpinner').css('zIndex', '20000'); var promise = DataService.getJson('~/../content/data/json/ci/ci_dat_contentlist.json') promise.then( function (result) { @@ -170,32 +171,41 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout .select(); // console.log($scope.selectedCIListViewData); - $('#grid-view').empty(); - angular.forEach($scope.selectedCIListViewData, function (value, key) { - $scope.imagePath = "~/../content/images/ci/thumbnails/" + value._ThumbnailImage; + - var $el = $('
' + + $('#grid-view').empty(); + var $e1 = $('
  • ' + '
    ' - + '' - + '

    ' + value._Title + '

    ').appendTo('#grid-view'); + + ''//alt="{{value._Title}}" >' + + '

    {{value._Title}}

').appendTo('#grid-view'); + $compile($e1)($scope); + //angular.forEach($scope.selectedCIListViewData, function (value, key) { + // $scope.imagePath = "~/../content/images/ci/thumbnails/" + value._ThumbnailImage; + // var $el = $('
' + // + '
' + // + '' + // + '

' + value._Title + '

').appendTo('#grid-view'); - $compile($el)($scope); - $(".sidebar").mCustomScrollbar({ - autoHideScrollbar: true, - //theme:"rounded" - }); + // $compile($el)($scope); - }); + // $(".sidebar").mCustomScrollbar({ + // autoHideScrollbar: true, + // //theme:"rounded" + // }); + //}); + + $timeout(function () { $('#ciSpinner').css('visibility', 'hidden'); }, 300); }, function (error) { // handle errors here console.log(' $scope.IllustrationData = ' + error.statusText); } ); - + } $scope.IsVisible = function () { @@ -583,7 +593,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout parentSlug: 'clinical-illustrations', content: '
' + '
' + - '
' + + '
' + '

' + $scope.clickedCISummary + '

' + '
' + '
', @@ -612,14 +622,11 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout var imgHeight = $('.img-thumbnail').find('img').height(); if (imgHeight <= 0) imgHeight = 320; - var textH = $('.well').height(); + var textH = $('.img-subtitle').height(); textH = textH + 40; var blackBorderHeight = jspContentHeight - (imgHeight + textH); if ($('.jsPanel-content').length > 0) { - $('.jsPanel-btn-min').attr('style', 'display: none'); - $('.jsPanel-btn-max').attr('style', 'display: none'); - $('.jsPanel-btn-norm').attr('style', 'display: none'); - $('.well').css('margin-bottom', blackBorderHeight); + $('.img-subtitle').css('margin-bottom', blackBorderHeight); } } diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/ci/ci-view.html b/400-SOURCECODE/AIAHTML5.Web/app/views/ci/ci-view.html index fb50db5..86c3b6a 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/views/ci/ci-view.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/views/ci/ci-view.html @@ -180,6 +180,9 @@
+