Index: lams_tool_images/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.7 -r1.8
--- lams_tool_images/conf/language/lams/ApplicationResources_en_AU.properties	14 Nov 2008 18:40:13 -0000	1.7
+++ lams_tool_images/conf/language/lams/ApplicationResources_en_AU.properties	19 Nov 2008 17:24:18 -0000	1.8
@@ -86,6 +86,7 @@
 label.learning.by  =By
 label.learning.comments  =Comments
 label.learning.added.by  =Added by:
+label.learning.open.original.size  =Open original size
 monitoring.tab.summary  =Summary
 monitoring.tab.statistics  =Statistic
 monitoring.tab.edit.activity  =Edit Activity
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.1 -r1.2
--- lams_tool_images/web/includes/javascript/thickbox.js	13 Nov 2008 17:16:39 -0000	1.1
+++ lams_tool_images/web/includes/javascript/thickbox.js	19 Nov 2008 17:24:18 -0000	1.2
@@ -65,8 +65,12 @@
 	   var urlString = /\.jpg$|\.jpeg$|\.png$|\.gif$|\.bmp$/;
 	   var urlType = baseURL.toLowerCase().match(urlString);
 
-		if(urlType == '.jpg' || urlType == '.jpeg' || urlType == '.png' || urlType == '.gif' || urlType == '.bmp'){//code to show images
-				
+	var queryString = url.replace(/^[^\?]+\??/,'');
+	var params = tb_parseQuery( queryString );
+
+
+		if((!params['modal'])){//code to show images
+
 			TB_PrevCaption = "";
 			TB_PrevURL = "";
 			TB_PrevHTML = "";
@@ -123,10 +127,10 @@
 			}
 			// End Resizing
 			
-			TB_WIDTH = imageWidth + 30;
-			TB_HEIGHT = imageHeight + 60;
-			$("#TB_window").append("<a href='' id='TB_ImageOff' title='Close'><img id='TB_Image' src='"+url+"' width='"+imageWidth+"' height='"+imageHeight+"' alt='"+caption+"'/></a>" + "<div id='TB_caption'>"+caption+"<div id='TB_secondLine'>" + TB_imageCount + TB_PrevHTML + TB_NextHTML + "</div></div><div id='TB_closeWindow'><a href='#' id='TB_closeWindowButton' title='Close'>close</a> or Esc Key</div>"); 		
-			
+			TB_WIDTH = imageWidth + 50;
+			TB_HEIGHT = imageHeight + 80;
+			$("#TB_window").append("<a href='' id='TB_ImageOff' title='Close'>	<iframe id='TB_Image' style='border:0px;' frameborder='no' src='"+url+"' width='"+eval(imageWidth + 20)+"' height='"+eval(imageHeight + 20)+"'/></iframe></a>" + "<div id='TB_caption'>"+caption+"<div id='TB_secondLine'>" + TB_imageCount + TB_PrevHTML + TB_NextHTML + "</div></div><div id='TB_closeWindow'><a href='#' id='TB_closeWindowButton' title='Close'>close</a> or Esc Key</div>"); 		
+		
 			$("#TB_closeWindowButton").click(tb_remove);
 			
 			if (!(TB_PrevHTML === "")) {
@@ -180,9 +184,6 @@
 			
 			imgPreloader.src = url;
 		}else{//code to show html
-			
-			var queryString = url.replace(/^[^\?]+\??/,'');
-			var params = tb_parseQuery( queryString );
 
 			TB_WIDTH = (params['width']*1) + 30 || 630; //defaults to 630 if no paramaters were added to URL
 			TB_HEIGHT = (params['height']*1) + 40 || 440; //defaults to 440 if no paramaters were added to URL
Index: lams_tool_images/web/pages/authoring/parts/itemlist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/authoring/parts/itemlist.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_images/web/pages/authoring/parts/itemlist.jsp	14 Nov 2008 13:01:59 -0000	1.4
+++ lams_tool_images/web/pages/authoring/parts/itemlist.jsp	19 Nov 2008 17:24:17 -0000	1.5
@@ -30,7 +30,7 @@
 				</td>
 				
 				<td style="vertical-align:middle;">
-					<a href="${mediumImagePath}" rel="lightbox" title="Enlarge image">${image.title}</a>
+					<a href="${mediumImagePath}" rel="lightbox" title="${image.title}">${image.title}</a>
 				</td>
 
 				<td width="40px" style="vertical-align:middle;">
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.6 -r1.7
--- lams_tool_images/web/pages/learning/learning.jsp	18 Nov 2008 14:55:43 -0000	1.6
+++ lams_tool_images/web/pages/learning/learning.jsp	19 Nov 2008 17:24:18 -0000	1.7
@@ -35,9 +35,10 @@
 		
 		.caption{position:absolute;top:0px;left:0px;width:150px;font-size:12px;color:#0087e5;}
 		#description{position:absolute; top:1000px; left:1000px; width:150px; font-style:italic;}
+		#openOriginalSizeLink{position:absolute; top:1000px; left:1000px;}
 		#rating_stars{position: absolute; top: 1000px; left: 1000px; width:150px; margin-top: 10}		
 		
-		#main_image{margin: 0 auto 20 0; height: ${(mediumImageDimensions*3)/4 + 20}px; width: ${mediumImageDimensions}px;}
+		#main_image{margin: 0 auto 20 0; height: ${(mediumImageDimensions*3)/4 + 40}px; width: ${mediumImageDimensions}px;}
 		#main_image img{margin-bottom: 10px; border: 1px solid #111;}
 		
 		.check_for_new{position: relative; top: -123px; left: 660px;}
@@ -79,14 +80,19 @@
 				$('#description').html("");
 				$("#description").css('left', image.width() + 20);
 				$("#description").css('top', caption.height() + 10);
+
+				var linkLeftPosition = ($("#openOriginalSizeLink_size").width() >= image.width()) ? 0 : ((image.width() - $("#openOriginalSizeLink_size").width())/2);
+				$("#openOriginalSizeLink").css('left', linkLeftPosition);
+				$("#openOriginalSizeLink").css('top', image.height() + 10);
+				$("#openOriginalSizeLink").width(image.width());
+						
 				setStarRatingChecked(0);
 				$("#rating_stars").css('left', image.width() + 20);					
 				$("#rating_stars").css('top', image.height() - 40);
 				
 				//adjust #main_image height to real image size
 				var newHeight = (image.height() >= ${(mediumImageDimensions*3)/4}) ? ${mediumImageDimensions} : ${(mediumImageDimensions*3)/4};
-				//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!TODO for the JIRA
-			    $('#main_image').css('height', newHeight + 20);
+			    $('#main_image').css('height', newHeight + 40);
 
 			    loadImageData(thumb.attr('id'));
 			},
@@ -161,6 +167,13 @@
 			var description = $('#commentsArea_addedBy').val() + $('#commentsArea_description').val();
 			$('#description').html(description);
 
+			var title = $('#commentsArea_title').val();
+			$("#openOriginalSizeLink a").attr('title', title);
+			
+			var href = "<html:rewrite page='/download/?preferDownload=false'/>";
+			href = href + "&uuid=" + $('#commentsArea_originalFileUuid').val();
+			$("#openOriginalSizeLink a").attr('href', href);
+			
 			var imageUid = $('#commentsArea_imageUid').val();
 			if (${imageGallery.allowRank && (mode != 'teacher')}) {
 				//adjust #rating_stars top position to description height 
@@ -273,6 +286,12 @@
 					
 			<div id="main_image"></div>
 			
+			<div id="openOriginalSizeLink">
+				<a href="" title="Enlarge" class="thickbox" >
+					<fmt:message key="label.learning.open.original.size" />
+				</a>
+			</div>
+			
 			<%--Ranking/Voting area---------------------------------------%>
 
 			<c:if test="${(mode != 'teacher') && (not empty sessionMap.imageGalleryList)}">				
@@ -406,6 +425,10 @@
 				</c:choose>
 			</div>
 		</c:if>
+		
+		<div id="openOriginalSizeLink_size" style="display:none;" >
+			<fmt:message key="label.learning.open.original.size" />
+		</div>		
 
 	</div>
 	<%--closes content--%>
Index: lams_tool_images/web/pages/learning/parts/commentsarea.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/learning/parts/commentsarea.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_images/web/pages/learning/parts/commentsarea.jsp	18 Nov 2008 14:55:43 -0000	1.4
+++ lams_tool_images/web/pages/learning/parts/commentsarea.jsp	19 Nov 2008 17:24:17 -0000	1.5
@@ -17,6 +17,8 @@
 
 
 <input type="hidden" name="imageUid" id="commentsArea_imageUid" value="${commentsImage.uid}"/>
+<input type="hidden" name="title" id="commentsArea_title" value="${commentsImage.title}"/>
+<input type="hidden" name="originalFileUuid" id="commentsArea_originalFileUuid" value="${commentsImage.originalFileUuid}"/>
 <input type="hidden" name="imageDescription" id="commentsArea_description" value="${commentsImage.description}"/>
 <input type="hidden" name="averageRating" id="commentsArea_averageRating" value="${commentsImage.averageRating}"/>
 <input type="hidden" name="numberRatings" id="commentsArea_numberRatings" value="${commentsImage.numberRatings}"/>