ADAM / AIAHTML5

Commit 70bc743f80c4d9a295e3d82404e16fdf86c56407

Authored by Nikita Kulshreshtha
2 parents 998dcefc ef3ad676

Merge branch 'Develop' into QA

Inline Side-by-side
Showing 4 changed files with 34 additions and 24 deletions
400-SOURCECODE/AIAHTML5.API/Web.config
  View file @70bc743
... ... @@ -39,7 +39,7 @@
39 39 <add key="EnableSSL" value="false" />
40 40 <add key="Site_Url" value ="http://34.207.39.107/"/>
41 41 <add key ="HostAddress" value="10.100.12.13" />
42   - <add key="isUserAuthenticated" value="true"/>
  42 + <add key="isUserAuthenticated" value="false"/>
43 43 <add key="AdminSupport" value="amrita.vishnoi@ebix.com,nikita.kulshreshtha@ebix.com"/>
44 44 </appSettings>
45 45 <system.web>
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
  View file @70bc743
... ... @@ -552,7 +552,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
552 552 ' kind="captions" srclang="en" label="On"><object width="640" height="360"' +
553 553 ' type="application/x-shockwave-flash" data="//vjs.zencdn.net/3.2/video-js.swf"><param name="allowfullscreen" value="true">' +
554 554 ' <param name="allowscriptaccess" value="always"><param name="movie" value="//vjs.zencdn.net/3.2/video-js.swf">' +
555   - ' <param name="flashvars" ng-value="controls=true&amp;file=' + $scope.clickedCAVideo + '"><img ng-src="content/images/common/player/frameaccuracy_logo.jpg" style="height:80%;" alt="Here we are" title="No video playback capabilities"></object></video><div class="col-sm-12 well"><div id="sid" align="left" style="height:40px;overflow-y:scroll !important"><p>' + $scope.clickedCASummary + '</p></div><button id="btnTxtOnOff" class="btn btn-primary pull-right">Text Off</button></div></div></div>',
  555 + ' <param name="flashvars" ng-value="controls=true&amp;file=' + $scope.clickedCAVideo + '"><img ng-src="content/images/common/player/frameaccuracy_logo.jpg" style="height:80%;" alt="Here we are" title="No video playback capabilities"></object></video><div class="col-sm-12 well video-subtitle"><div id="sid" align="left" style="height:40px;overflow-y:scroll !important"><p>' + $scope.clickedCASummary + '</p></div><button id="btnTxtOnOff" class="btn btn-primary pull-right">Text Off</button></div></div></div>',
556 556  
557 557 //ajax: {
558 558 // url: 'app/views/ca/ca-view-detail.html'
... ... @@ -581,12 +581,12 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
581 581 var videoHeight = $('#divplayerinlineVideo div').height();
582 582 if (videoHeight <= 0)
583 583 videoHeight = 360;
584   - var textH = $('.well').height();
  584 + var textH = $('.video-subtitle').height();
585 585 textH = textH + 40;
586 586 var blackBorderHeight = jspContentHeight - (videoHeight + textH);
587 587  
588 588 if ($('.jsPanel-content').length > 0) {
589   - $('.well').css('margin-bottom', blackBorderHeight);
  589 + $('.video-subtitle').css('margin-bottom', blackBorderHeight);
590 590 $('#divplayerinlineVideo').css('background', '#fff');
591 591 }
592 592  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
  View file @70bc743
... ... @@ -158,7 +158,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
158 158 };
159 159  
160 160 $scope.loadAllCI = function () {
161   -
  161 + $('#ciSpinner').css('visibility', 'visible');
  162 + $('#ciSpinner').css('zIndex', '20000');
162 163 var promise = DataService.getJson('~/../content/data/json/ci/ci_dat_contentlist.json')
163 164 promise.then(
164 165 function (result) {
... ... @@ -170,32 +171,41 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
170 171 .select();
171 172  
172 173 // console.log($scope.selectedCIListViewData);
173   - $('#grid-view').empty();
174   - angular.forEach($scope.selectedCIListViewData, function (value, key) {
175   - $scope.imagePath = "~/../content/images/ci/thumbnails/" + value._ThumbnailImage;
  174 +
176 175  
177   - var $el = $('<div id="' + value._id + '" class="col-sm-3 col-md-2" title = "' + value._Title + '" data-ng-click="openView($event)">'
  176 +
  177 + $('#grid-view').empty();
  178 + var $e1 = $('<ul><li ng-repeat="value in selectedCIListViewData" ><div id="{{value._id}}" class="col-sm-3 col-md-2" title = "{{value._Title}}" data-ng-click="openView($event)">'
178 179 + '<div class="thumbnail" >'
179   - + '<img id="' + value._Title + '"ng-src="' + $scope.imagePath + '" alt="" title="" >'
180   - + '<div class="caption"><p>' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view');
  180 + + '<img id="{{value._Title}}" ng-src="~/../content/images/ci/thumbnails/{{value._ThumbnailImage}}" >'//alt="{{value._Title}}" >'
  181 + + '<div class="caption"><p> {{value._Title}}</p></div></a></div></div></li></ul>').appendTo('#grid-view');
  182 + $compile($e1)($scope);
  183 + //angular.forEach($scope.selectedCIListViewData, function (value, key) {
  184 + // $scope.imagePath = "~/../content/images/ci/thumbnails/" + value._ThumbnailImage;
181 185  
  186 + // var $el = $('<div id="' + value._id + '" class="col-sm-3 col-md-2" title = "' + value._Title + '" data-ng-click="openView($event)">'
  187 + // + '<div class="thumbnail" >'
  188 + // + '<img id="' + value._Title + '"ng-src="' + $scope.imagePath + '" alt="" title="" >'
  189 + // + '<div class="caption"><p>' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view');
182 190  
183   - $compile($el)($scope);
184 191  
185   - $(".sidebar").mCustomScrollbar({
186   - autoHideScrollbar: true,
187   - //theme:"rounded"
188   - });
  192 + // $compile($el)($scope);
189 193  
190   - });
  194 + // $(".sidebar").mCustomScrollbar({
  195 + // autoHideScrollbar: true,
  196 + // //theme:"rounded"
  197 + // });
191 198  
  199 + //});
  200 +
  201 + $timeout(function () { $('#ciSpinner').css('visibility', 'hidden'); }, 300);
192 202 },
193 203 function (error) {
194 204 // handle errors here
195 205 console.log(' $scope.IllustrationData = ' + error.statusText);
196 206 }
197 207 );
198   -
  208 +
199 209 }
200 210  
201 211 $scope.IsVisible = function () {
... ... @@ -583,7 +593,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
583 593 parentSlug: 'clinical-illustrations',
584 594 content: '<div class="row" id="canvasDiv"><div style="align:left;width:100%;height:100%"><canvas id="canvas" ng-click="onDrawingCanvasClick($event)" width="1369" height="325" class="canvas-annotationStyle" style="position: absolute; background-color: transparent;z-index:1 "></canvas> <canvas id="canvasPaint" ng-click="FreeStylePaint($event)" width="1369" height="325" class="canvas-annotationStyle1" style="position: absolute;z-index:0;"></canvas></div>' +
585 595 '<div class="col-sm-12 img-thumbnail" align="center">' +
586   - '<img src="' + $scope.clickedCIImage + '" alt="" title="" class="img-responsive "><div class="col-sm-12 well">' +
  596 + '<img src="' + $scope.clickedCIImage + '" alt="" title="" class="img-responsive "><div class="col-sm-12 well img-subtitle">' +
587 597 '<div align="left" id="sid"><p>' + $scope.clickedCISummary + '</p></div><button id="btnTxtOnOff" class="btn btn-primary pull-right">Text Off</button>' +
588 598 '<script>$(document).ready(function(){$("#btnTxtOnOff").click(function(){$("#sid").toggle();if($.trim($(this).text()) === "Text Off"){$(this).text("Text On");}else{$(this).text("Text Off");}});});</script></div>' +
589 599 '</div></div>',
... ... @@ -612,14 +622,11 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
612 622 var imgHeight = $('.img-thumbnail').find('img').height();
613 623 if (imgHeight <= 0)
614 624 imgHeight = 320;
615   - var textH = $('.well').height();
  625 + var textH = $('.img-subtitle').height();
616 626 textH = textH + 40;
617 627 var blackBorderHeight = jspContentHeight - (imgHeight + textH);
618 628 if ($('.jsPanel-content').length > 0) {
619   - $('.jsPanel-btn-min').attr('style', 'display: none');
620   - $('.jsPanel-btn-max').attr('style', 'display: none');
621   - $('.jsPanel-btn-norm').attr('style', 'display: none');
622   - $('.well').css('margin-bottom', blackBorderHeight);
  629 + $('.img-subtitle').css('margin-bottom', blackBorderHeight);
623 630 }
624 631 }
625 632  
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/ci/ci-view.html
  View file @70bc743
... ... @@ -180,6 +180,9 @@
180 180 </div>
181 181 </div>
182 182 </div>
  183 + <div id="ciSpinner" class="spinner" ng-show="isLoading" style="visibility:hidden">
  184 + <img id="img-spinner" src="content/images/common/loading.gif" alt="Loading" />
  185 + </div>
183 186 </div>
184 187  
185 188  
... ...