Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java,v diff -u -r1.28 -r1.29 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java 26 Sep 2014 21:47:28 -0000 1.28 +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java 27 Sep 2014 11:02:47 -0000 1.29 @@ -248,17 +248,19 @@ // remove hidden items if (!image.isHide()) { images.add(image); - } - - //escape characters - String titleEscaped = StringEscapeUtils.escapeJavaScript(image.getTitle()); - image.setTitleEscaped(titleEscaped); - String descriptionEscaped = StringEscapeUtils.escapeJavaScript(image.getDescription()); - image.setDescriptionEscaped(descriptionEscaped); + } } } else { images.addAll(imageGallery.getImageGalleryItems()); } + + // escape characters + for (ImageGalleryItem image : images) { + String titleEscaped = StringEscapeUtils.escapeJavaScript(image.getTitle()); + image.setTitleEscaped(titleEscaped); + String descriptionEscaped = StringEscapeUtils.escapeJavaScript(image.getDescription()); + image.setDescriptionEscaped(descriptionEscaped); + } sessionMap.put(ImageGalleryConstants.ATTR_IMAGE_LIST, images); sessionMap.put(ImageGalleryConstants.ATTR_IMAGE_GALLERY, imageGallery); Index: lams_tool_images/web/pages/learning/learning.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/learning/learning.jsp,v diff -u -r1.32 -r1.33 --- lams_tool_images/web/pages/learning/learning.jsp 26 Sep 2014 21:47:28 -0000 1.32 +++ lams_tool_images/web/pages/learning/learning.jsp 27 Sep 2014 11:02:47 -0000 1.33 @@ -111,7 +111,7 @@ .fotorama({ //TODO history : true, width: ${mediumImageDimensions + 60}, - height: ${mediumImageDimensions + 60}*9/16, + height: Math.round(${mediumImageDimensions + 60}*9/16), maxwidth: '100%', //ratio: 16/9, allowfullscreen: true,