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.6 -r1.7 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java 18 Nov 2008 14:55:43 -0000 1.6 +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java 25 Nov 2008 15:22:03 -0000 1.7 @@ -722,7 +722,7 @@ if (StringUtils.isEmpty(contentType) || !(contentType.equals("image/gif") || contentType.equals("image/png") || contentType.equals("image/jpg") || contentType.equals("image/jpeg") || contentType - .equals("image/pjpeg"))) { + .equals("image/pjpeg") || contentType.equals("image/x-png"))) { errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage( ImageGalleryConstants.ERROR_MSG_NOT_ALLOWED_FORMAT)); } Index: lams_tool_images/web/includes/javascript/thickbox.js =================================================================== RCS file: /usr/local/cvsroot/lams_tool_images/web/includes/javascript/thickbox.js,v diff -u -r1.2 -r1.3 --- lams_tool_images/web/includes/javascript/thickbox.js 19 Nov 2008 17:24:18 -0000 1.2 +++ lams_tool_images/web/includes/javascript/thickbox.js 25 Nov 2008 15:22:03 -0000 1.3 @@ -127,9 +127,16 @@ } // End Resizing - TB_WIDTH = imageWidth + 50; - TB_HEIGHT = imageHeight + 80; - $("#TB_window").append(" " + "

"+caption+"

" + TB_imageCount + TB_PrevHTML + TB_NextHTML + "

close or Esc Key

"); + TB_WIDTH = imageWidth + 30; + TB_HEIGHT = imageHeight + 60; + + alert(imgPreloader.width); + alert(imgPreloader.height); + if ((imgPreloader.width > x) ||(imgPreloader.height > y)) { + $("#TB_window").append("" + "

"+caption+"

" + TB_imageCount + TB_PrevHTML + TB_NextHTML + "

close or Esc Key

"); + } else { + $("#TB_window").append("

" + "

"+caption+"

" + TB_imageCount + TB_PrevHTML + TB_NextHTML + "

close or Esc Key

"); + } $("#TB_closeWindowButton").click(tb_remove); 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.8 -r1.9 --- lams_tool_images/web/pages/learning/learning.jsp 19 Nov 2008 20:03:48 -0000 1.8 +++ lams_tool_images/web/pages/learning/learning.jsp 25 Nov 2008 15:22:03 -0000 1.9 @@ -140,6 +140,13 @@ $('#votingForm').ajaxSubmit(options); return false; }); + + //to prevent scroll bars overlapping + //var nav = navigator.appName; + //if (nav == "Microsoft Internet Explorer") { + //alert(parent.document.getElementById("contentFrame").width); + //parent.document.getElementById("contentFrame").width = "2000px"; + //} });