').appendTo('#grid-view');
@@ -328,9 +340,10 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
$scope.ApplySearchByAlphabet = function (SearchText) {
-
$rootScope.isLoading = true;
+ $('ul li a').removeAttr("style");
$('#spinner').css('visibility', 'visible');
+ $('#' + SearchText).css({"color": "white", "background-color" : "#1B92D0"});
$scope.filterstring = true;
@@ -341,6 +354,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
+
if (typeof (SearchText) !== "undefined" && (SearchText !== null && SearchText !== "")) {
localStorage.setItem("AIImageId", SearchText);
@@ -386,7 +400,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
if (selectimg === true) {
$scope.imagePath = "~/../content/images/ai/thumbnails/" + value._ThumbnailImage;
- var $el = $('
'
+ var $el = $('
'
+ '
'
+ '
![]()
'
+ '
').appendTo('#grid-view');
@@ -479,7 +493,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
var counter = 1;
var tittle = $rootScope.getLocalStorageValue("currentImageTitleFromJson");
- localStorage.setItem("currentImageTitle", tittle);
+ localStorage.setItem("currentViewTitle", tittle);
var promise = DataService.getJson('~/../content/data/json/ai/ai_dat_contentlist.json')
promise.then(
@@ -509,7 +523,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
//ajax: {
// url: 'app/views/ci/ci-view-detail.html'
//},
- title: $rootScope.getLocalStorageValue("currentImageTitle"),
+ title: $rootScope.getLocalStorageValue("currentViewTitle"),
position: {
top: 70,
left: 20,
@@ -535,7 +549,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
});
- $("#aiImagePanel .img-thumbnail").css("height", $("#aiImagePanel .jsPanel-content").height());
+ //$("#aiImagePanel .img-thumbnail").css("height", $("#aiImagePanel .jsPanel-content").height());
+ $('.jsPanel-content .jsPanel-theme-success').css('overflow-y', 'auto !important')
var jspContentHeight = $('.jsPanel-content').height();
}
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index 3aa10de..cd703b3 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -1324,6 +1324,9 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
if ($('#ciImagePanel').length > 0)
$('#ciImagePanel').remove();
+ if ($('#aiImagePanel').length > 0)
+ $('#aiImagePanel').remove();
+
if ($('#caVideoPanel').length > 0)
$('#caVideoPanel').remove();
@@ -5507,6 +5510,7 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
function OpenJSPanel() {
$("#daImagePanel").css({ "pointer-events": "none", "opacity": ".5" });
$("#ciImagePanel").css({ "pointer-events": "none", "opacity": ".5" });
+ $("#aiImagePanel").css({ "pointer-events": "none", "opacity": ".5" });
$("#ImagePanel").css({ "pointer-events": "none", "opacity": ".5" });
$.jsPanel({
id: 'jsPanel-1',
@@ -5647,6 +5651,7 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
$(document).on('click', '#jsPanel-1 .jsglyph-remove', function () {
$("#daImagePanel").css({ "pointer-events": "auto", "opacity": "1" });
$("#ciImagePanel").css({ "pointer-events": "auto", "opacity": "1" });
+ $("#aiImagePanel").css({ "pointer-events": "auto", "opacity": "1" });
$("#ImagePanel").css({ "pointer-events": "auto", "opacity": "1" });
$("#annotationButton").parent().removeClass("disableMenuannotation");
$("#annotationToolBarOptions").removeClass("disableMenuoption");
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/ai/adam-images-detail.html b/400-SOURCECODE/AIAHTML5.Web/app/views/ai/adam-images-detail.html
index 3615bb6..39a5414 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/views/ai/adam-images-detail.html
+++ b/400-SOURCECODE/AIAHTML5.Web/app/views/ai/adam-images-detail.html
@@ -1,6 +1,4 @@
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/ai/ai-view.html b/400-SOURCECODE/AIAHTML5.Web/app/views/ai/ai-view.html
index c252b82..4f115f2 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/views/ai/ai-view.html
+++ b/400-SOURCECODE/AIAHTML5.Web/app/views/ai/ai-view.html
@@ -16,32 +16,32 @@
diff --git a/400-SOURCECODE/AIAHTML5.Web/index.aspx b/400-SOURCECODE/AIAHTML5.Web/index.aspx
index e5f01fb..9a166b4 100644
--- a/400-SOURCECODE/AIAHTML5.Web/index.aspx
+++ b/400-SOURCECODE/AIAHTML5.Web/index.aspx
@@ -164,8 +164,8 @@
diff --git a/400-SOURCECODE/AIAHTML5.Web/libs/jquery/jquery_plugin/jsPanel/jspanel/jquery.jspanel.css b/400-SOURCECODE/AIAHTML5.Web/libs/jquery/jquery_plugin/jsPanel/jspanel/jquery.jspanel.css
index 7b0d15b..603201a 100644
--- a/400-SOURCECODE/AIAHTML5.Web/libs/jquery/jquery_plugin/jsPanel/jspanel/jquery.jspanel.css
+++ b/400-SOURCECODE/AIAHTML5.Web/libs/jquery/jquery_plugin/jsPanel/jspanel/jquery.jspanel.css
@@ -310,7 +310,7 @@ h3.jsPanel-title{
.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;}
.jsPanel-hdr.jsPanel-theme-success h3{ color: #fff;font-size:20px;font-weight: bold }
.jsPanel-hdr.jsPanel-theme-success h3 small{ color: #fff; font-size: 65%; font-weight: bold}
-.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 }
+.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; }
.jsPanel-ftr.jsPanel-theme-success{}
.jsPanel-theme-successt .ui-icon-gripsmall-diagonal-se{ color: #000; }