ADAM / AIAHTML5

Commit b824626f6277635b96a68657dfca60825f6cd004

Authored by Nikita Kulshreshtha
2 parents c9d05f34 8005c883

merged AIAHTML_BUG_UP manually

Inline Side-by-side
Showing 7 changed files with 61 additions and 41 deletions
400-SOURCECODE/AIAHTML5.Web/Web.config
  View file @b824626
... ... @@ -20,7 +20,8 @@
20 20 <location path="app/views">
21 21  
22 22 </location>
23   - <system.webServer>
  23 + <system.webServer>.
  24 +
24 25 <rewrite>
25 26 <rules>
26 27 <rule name="AngularJS Routes" stopProcessing="true">
... ... @@ -42,6 +43,7 @@
42 43 <mimeMap fileExtension=".woff" mimeType="application/font-woff" />
43 44 <mimeMap fileExtension=".mp3" mimeType="audio/mpeg" />
44 45 <mimeMap fileExtension=".vtt" mimeType="text/vtt" />
  46 + <mimeMap fileExtension=".json" mimeType="application/json" />
45 47 <!--<mimeMap fileExtension=".woff2" mimeType="application/font-woff2" />-->
46 48  
47 49  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/AIController.js
  View file @b824626
1   -AIA.controller("AIController", ["$scope", "$window", "$rootScope", "$compile", "$http", "$log", "$location", "$timeout", "pages", "DataService",
2   -function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout, pages, DataService) {
  1 +AIA.controller("AIController", ["$scope", "$window", "$rootScope", "$compile", "$http", "$log", "$location", "$timeout", "pages", "DataService","AIAConstants",
  2 +function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout, pages, DataService, AIAConstants) {
3 3 // $rootScope.currentActiveModuleTitle = pages[3].name;
4 4 $scope.showTabButton = true;
5 5 $scope.IllustrationData;
... ... @@ -222,6 +222,18 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
222 222 }
223 223  
224 224 $scope.ApplySearch = function (SearchText) {
  225 + var currentSearchtext = $rootScope.getLocalStorageValue("AIImageId");
  226 + localStorage.setItem("AIImageId", '');
  227 + if (currentSearchtext == "undefined" || (currentSearchtext == null || currentSearchtext == ""))
  228 + {
  229 + if (SearchText == "undefined" || (SearchText == null || SearchText == ""))
  230 + {
  231 + $rootScope.errorMessage = AIAConstants.PLEASE_ENTER_SEARCH_TEXT;
  232 + $("#messageModal").modal('show');
  233 + // alert("Please enter the text !")
  234 + return false;
  235 + }
  236 + }
225 237  
226 238 $rootScope.isLoading = true;
227 239 $('#spinner').css('visibility', 'visible');
... ... @@ -279,7 +291,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
279 291 if (selectimg === true) {
280 292 $scope.imagePath = "~/../content/images/ai/thumbnails/" + value._ThumbnailImage;
281 293  
282   - var $el = $('<div id="' + value._id + '" class="col-sm-3 col-md-2" title = "' + value._Title + '" data-ng-click="AdamDetail($event)">'
  294 + var $el = $('<div id="' + value._id + '" class="col-sm-3 col-md-2" title = "' + value._Title + '" data-ng-click="OpenAdamImage($event)">'
283 295 + '<div style="width:auto;height:auto;" class="thumbnail" >'
284 296 + '<img style="height:150px" id="' + value._Title + '"ng-src="' + $scope.imagePath + '" alt="" title="" >'
285 297 + '<div class="caption"><p>' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view');
... ... @@ -328,9 +340,10 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
328 340  
329 341  
330 342 $scope.ApplySearchByAlphabet = function (SearchText) {
331   -
332 343 $rootScope.isLoading = true;
  344 + $('ul li a').removeAttr("style");
333 345 $('#spinner').css('visibility', 'visible');
  346 + $('#' + SearchText).css({"color": "white", "background-color" : "#1B92D0"});
334 347  
335 348 $scope.filterstring = true;
336 349  
... ... @@ -341,6 +354,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
341 354  
342 355  
343 356  
  357 +
344 358 if (typeof (SearchText) !== "undefined" && (SearchText !== null && SearchText !== "")) {
345 359  
346 360 localStorage.setItem("AIImageId", SearchText);
... ... @@ -386,7 +400,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
386 400 if (selectimg === true) {
387 401 $scope.imagePath = "~/../content/images/ai/thumbnails/" + value._ThumbnailImage;
388 402  
389   - var $el = $('<div id="' + value._id + '" class="col-sm-3 col-md-2" title = "' + value._Title + '" data-ng-click="AdamDetail($event)">'
  403 + var $el = $('<div id="' + value._id + '" class="col-sm-3 col-md-2" title = "' + value._Title + '" data-ng-click="OpenAdamImage($event)">'
390 404 + '<div style="width:auto;height:auto;" class="thumbnail" >'
391 405 + '<img style="height:150px" id="' + value._Title + '"ng-src="' + $scope.imagePath + '" alt="" title="" >'
392 406 + '<div class="caption"><p>' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view');
... ... @@ -479,7 +493,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
479 493  
480 494 var counter = 1;
481 495 var tittle = $rootScope.getLocalStorageValue("currentImageTitleFromJson");
482   - localStorage.setItem("currentImageTitle", tittle);
  496 + localStorage.setItem("currentViewTitle", tittle);
483 497  
484 498 var promise = DataService.getJson('~/../content/data/json/ai/ai_dat_contentlist.json')
485 499 promise.then(
... ... @@ -509,7 +523,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
509 523 //ajax: {
510 524 // url: 'app/views/ci/ci-view-detail.html'
511 525 //},
512   - title: $rootScope.getLocalStorageValue("currentImageTitle"),
  526 + title: $rootScope.getLocalStorageValue("currentViewTitle"),
513 527 position: {
514 528 top: 70,
515 529 left: 20,
... ... @@ -535,7 +549,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
535 549 });
536 550  
537 551  
538   - $("#aiImagePanel .img-thumbnail").css("height", $("#aiImagePanel .jsPanel-content").height());
  552 + //$("#aiImagePanel .img-thumbnail").css("height", $("#aiImagePanel .jsPanel-content").height());
  553 + $('.jsPanel-content .jsPanel-theme-success').css('overflow-y', 'auto !important')
539 554 var jspContentHeight = $('.jsPanel-content').height();
540 555  
541 556 }
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @b824626
... ... @@ -1324,6 +1324,9 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
1324 1324 if ($('#ciImagePanel').length > 0)
1325 1325 $('#ciImagePanel').remove();
1326 1326  
  1327 + if ($('#aiImagePanel').length > 0)
  1328 + $('#aiImagePanel').remove();
  1329 +
1327 1330 if ($('#caVideoPanel').length > 0)
1328 1331 $('#caVideoPanel').remove();
1329 1332  
... ... @@ -5507,6 +5510,7 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
5507 5510 function OpenJSPanel() {
5508 5511 $("#daImagePanel").css({ "pointer-events": "none", "opacity": ".5" });
5509 5512 $("#ciImagePanel").css({ "pointer-events": "none", "opacity": ".5" });
  5513 + $("#aiImagePanel").css({ "pointer-events": "none", "opacity": ".5" });
5510 5514 $("#ImagePanel").css({ "pointer-events": "none", "opacity": ".5" });
5511 5515 $.jsPanel({
5512 5516 id: 'jsPanel-1',
... ... @@ -5647,6 +5651,7 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
5647 5651 $(document).on('click', '#jsPanel-1 .jsglyph-remove', function () {
5648 5652 $("#daImagePanel").css({ "pointer-events": "auto", "opacity": "1" });
5649 5653 $("#ciImagePanel").css({ "pointer-events": "auto", "opacity": "1" });
  5654 + $("#aiImagePanel").css({ "pointer-events": "auto", "opacity": "1" });
5650 5655 $("#ImagePanel").css({ "pointer-events": "auto", "opacity": "1" });
5651 5656 $("#annotationButton").parent().removeClass("disableMenuannotation");
5652 5657 $("#annotationToolBarOptions").removeClass("disableMenuoption");
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/ai/adam-images-detail.html
  View file @b824626
1 1 <div>
2 2 <div ng-include="aap/widget/MainMenu.html"></div>
3   - <div ng-init="OpenAdamImageView()" id="AIView" class="aiView" ng-controller="AIController" style=" "></div> <!--position: absolute !important;-->
4   -
5   -
  3 + <div ng-init="OpenAdamImageView()" id="AIView" class="aiView" ng-controller="AIController" style=" "></div> <!--position: absolute !important;-->
6 4 </div>
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/ai/ai-view.html
  View file @b824626
... ... @@ -16,32 +16,32 @@
16 16 </form>
17 17 <nav>
18 18 <ul class="pagination pagination-sm no-margin">
19   - <li><a href="#" ng-click="ApplySearchByAlphabet('A')">A</a></li>
20   - <li><a href="#" ng-click="ApplySearchByAlphabet('B')">B</a></li>
21   - <li><a href="#" ng-click="ApplySearchByAlphabet('C')">C</a></li>
22   - <li><a href="#" ng-click="ApplySearchByAlphabet('D')">D</a></li>
23   - <li><a href="#" ng-click="ApplySearchByAlphabet('E')">E</a></li>
24   - <li><a href="#" ng-click="ApplySearchByAlphabet('F')">F</a></li>
25   - <li><a href="#" ng-click="ApplySearchByAlphabet('G')">G</a></li>
26   - <li><a href="#" ng-click="ApplySearchByAlphabet('H')">H</a></li>
27   - <li><a href="#" ng-click="ApplySearchByAlphabet('I')">I</a></li>
28   - <li><a href="#" ng-click="ApplySearchByAlphabet('J')">J</a></li>
29   - <li><a href="#" ng-click="ApplySearchByAlphabet('K')">K</a></li>
30   - <li><a href="#" ng-click="ApplySearchByAlphabet('L')">L</a></li>
31   - <li><a href="#" ng-click="ApplySearchByAlphabet('M')">M</a></li>
32   - <li><a href="#" ng-click="ApplySearchByAlphabet('N')">N</a></li>
33   - <li><a href="#" ng-click="ApplySearchByAlphabet('O')">O</a></li>
34   - <li><a href="#" ng-click="ApplySearchByAlphabet('P')">P</a></li>
35   - <li><a href="#" ng-click="ApplySearchByAlphabet('Q')">Q</a></li>
36   - <li><a href="#" ng-click="ApplySearchByAlphabet('R')">R</a></li>
37   - <li><a href="#" ng-click="ApplySearchByAlphabet('S')">S</a></li>
38   - <li><a href="#" ng-click="ApplySearchByAlphabet('T')">T</a></li>
39   - <li><a href="#" ng-click="ApplySearchByAlphabet('U')">U</a></li>
40   - <li><a href="#" ng-click="ApplySearchByAlphabet('V')">V</a></li>
41   - <li><a href="#" ng-click="ApplySearchByAlphabet('W')">W</a></li>
42   - <li><a href="#" ng-click="ApplySearchByAlphabet('X')">X</a></li>
43   - <li><a href="#" ng-click="ApplySearchByAlphabet('Y')">Y</a></li>
44   - <li><a href="#" ng-click="ApplySearchByAlphabet('Z')">Z</a></li>
  19 + <li><a id="A" href="#" ng-click="ApplySearchByAlphabet('A')">A</a></li>
  20 + <li><a id="B" href="#" ng-click="ApplySearchByAlphabet('B')">B</a></li>
  21 + <li><a id="C" href="#" ng-click="ApplySearchByAlphabet('C')">C</a></li>
  22 + <li><a id="D" href="#" ng-click="ApplySearchByAlphabet('D')">D</a></li>
  23 + <li><a id="E" href="#" ng-click="ApplySearchByAlphabet('E')">E</a></li>
  24 + <li><a id="F" href="#" ng-click="ApplySearchByAlphabet('F')">F</a></li>
  25 + <li><a id="G" href="#" ng-click="ApplySearchByAlphabet('G')">G</a></li>
  26 + <li><a id="H" href="#" ng-click="ApplySearchByAlphabet('H')">H</a></li>
  27 + <li><a id="I" href="#" ng-click="ApplySearchByAlphabet('I')">I</a></li>
  28 + <li><a id="J" href="#" ng-click="ApplySearchByAlphabet('J')">J</a></li>
  29 + <li><a id="K" href="#" ng-click="ApplySearchByAlphabet('K')">K</a></li>
  30 + <li><a id="L" href="#" ng-click="ApplySearchByAlphabet('L')">L</a></li>
  31 + <li><a id="M" href="#" ng-click="ApplySearchByAlphabet('M')">M</a></li>
  32 + <li><a id="N" href="#" ng-click="ApplySearchByAlphabet('N')">N</a></li>
  33 + <li><a id="O" href="#" ng-click="ApplySearchByAlphabet('O')">O</a></li>
  34 + <li><a id="P" href="#" ng-click="ApplySearchByAlphabet('P')">P</a></li>
  35 + <li><a id="Q" href="#" ng-click="ApplySearchByAlphabet('Q')">Q</a></li>
  36 + <li><a id="R" href="#" ng-click="ApplySearchByAlphabet('R')">R</a></li>
  37 + <li><a id="S" href="#" ng-click="ApplySearchByAlphabet('S')">S</a></li>
  38 + <li><a id="T" href="#" ng-click="ApplySearchByAlphabet('T')">T</a></li>
  39 + <li><a id="U" href="#" ng-click="ApplySearchByAlphabet('U')">U</a></li>
  40 + <li><a id="V" href="#" ng-click="ApplySearchByAlphabet('V')">V</a></li>
  41 + <li><a id="W" href="#" ng-click="ApplySearchByAlphabet('W')">W</a></li>
  42 + <li><a id="X" href="#" ng-click="ApplySearchByAlphabet('X')">X</a></li>
  43 + <li><a id="Y" href="#" ng-click="ApplySearchByAlphabet('Y')">Y</a></li>
  44 + <li><a id="Z" href="#" ng-click="ApplySearchByAlphabet('Z')">Z</a></li>
45 45 </ul>
46 46 <button type="button" class="btn btn-primary btn-sm" ng-click="Reset(query)" style = "margin-bottom:23px"><i class="fa fa-eye"></i>Show All</button>
47 47 </nav>
... ...
400-SOURCECODE/AIAHTML5.Web/index.aspx
  View file @b824626
... ... @@ -164,8 +164,8 @@
164 164 </style>
165 165  
166 166 <script>
167   - var params = "<%=urlParams%>";
168   - var isCalsCredantialForSIte ="<%=isCalsCredantial%>";
  167 + var params = "<%=urlParams%>";
  168 + var isCalsCredantialForSIte = "<%=isCalsCredantial%>";
169 169 </script>
170 170  
171 171 </head>
... ...
400-SOURCECODE/AIAHTML5.Web/libs/jquery/jquery_plugin/jsPanel/jspanel/jquery.jspanel.css
  View file @b824626
... ... @@ -310,7 +310,7 @@ h3.jsPanel-title{
310 310 .jsPanel-hdr.jsPanel-theme-success{ color: #fff; font-family: Open Sans, Helvetica,tahoma,arial,verdana,sans-serif; font-weight: bold; font-size:15px; background: #818D43; height:20px;}
311 311 .jsPanel-hdr.jsPanel-theme-success h3{ color: #fff;font-size:20px;font-weight: bold }
312 312 .jsPanel-hdr.jsPanel-theme-success h3 small{ color: #fff; font-size: 65%; font-weight: bold}
313   -.jsPanel-content.jsPanel-theme-success { background: none repeat scroll 0 0 #ffffff; color: #000000; font-family: tahoma,arial,verdana,sans-serif; outline: 1px solid #bbb;background-color:#222222 }
  313 +.jsPanel-content.jsPanel-theme-success { background: none repeat scroll 0 0 #ffffff; color: #000000; font-family: tahoma,arial,verdana,sans-serif; outline: 1px solid #bbb;background-color:#222222; }
314 314 .jsPanel-ftr.jsPanel-theme-success{}
315 315 .jsPanel-theme-successt .ui-icon-gripsmall-diagonal-se{ color: #000; }
316 316  
... ...