Index: lams_tool_images/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rd135b890fdc2d5b58c6bd02c48c8b3365d9a2ffe -r4b47f86b588e38c9e7e9f2760c75f775cb080831
--- lams_tool_images/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision d135b890fdc2d5b58c6bd02c48c8b3365d9a2ffe)
+++ lams_tool_images/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 4b47f86b588e38c9e7e9f2760c75f775cb080831)
@@ -98,6 +98,9 @@
 label.monitoring.updatecomment.save  =Save
 label.monitoring.updatecomment.posted.by  =Posted by
 label.monitoring.updatecomment.posted.on  =Posted on
+label.export.uploaded.by  =Uploaded by
+label.export.voted.for.this.image  =Voted for this image
+label.export.images  =Images
 message.monitoring.edit.activity.not.editable  =This Activity is no longer editable
 output.desc.learner.number.of.images.uploaded  =Number of images uploaded by user
 output.desc.learner.number.of.comments  =Number of comments posted by user
Index: lams_tool_images/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -rd135b890fdc2d5b58c6bd02c48c8b3365d9a2ffe -r4b47f86b588e38c9e7e9f2760c75f775cb080831
--- lams_tool_images/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision d135b890fdc2d5b58c6bd02c48c8b3365d9a2ffe)
+++ lams_tool_images/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 4b47f86b588e38c9e7e9f2760c75f775cb080831)
@@ -98,6 +98,9 @@
 label.monitoring.updatecomment.save  =Save
 label.monitoring.updatecomment.posted.by  =Posted by
 label.monitoring.updatecomment.posted.on  =Posted on
+label.export.uploaded.by  =Uploaded by
+label.export.voted.for.this.image  =Voted for this image
+label.export.images  =Images
 message.monitoring.edit.activity.not.editable  =This Activity is no longer editable
 output.desc.learner.number.of.images.uploaded  =Number of images uploaded by user
 output.desc.learner.number.of.comments  =Number of comments posted by user
Index: lams_tool_images/conf/language/rams/ApplicationResources.properties
===================================================================
diff -u -rd135b890fdc2d5b58c6bd02c48c8b3365d9a2ffe -r4b47f86b588e38c9e7e9f2760c75f775cb080831
--- lams_tool_images/conf/language/rams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision d135b890fdc2d5b58c6bd02c48c8b3365d9a2ffe)
+++ lams_tool_images/conf/language/rams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 4b47f86b588e38c9e7e9f2760c75f775cb080831)
@@ -98,6 +98,9 @@
 label.monitoring.updatecomment.save  =Save
 label.monitoring.updatecomment.posted.by  =Posted by
 label.monitoring.updatecomment.posted.on  =Posted on
+label.export.uploaded.by  =Uploaded by
+label.export.voted.for.this.image  =Voted for this image
+label.export.images  =Images
 message.monitoring.edit.activity.not.editable  =This Activity is no longer editable
 output.desc.learner.number.of.images.uploaded  =Number of images uploaded by user
 output.desc.learner.number.of.comments  =Number of comments posted by user
Index: lams_tool_images/conf/language/rams/ApplicationResources_en_AU.properties
===================================================================
diff -u -rd135b890fdc2d5b58c6bd02c48c8b3365d9a2ffe -r4b47f86b588e38c9e7e9f2760c75f775cb080831
--- lams_tool_images/conf/language/rams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision d135b890fdc2d5b58c6bd02c48c8b3365d9a2ffe)
+++ lams_tool_images/conf/language/rams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 4b47f86b588e38c9e7e9f2760c75f775cb080831)
@@ -98,6 +98,9 @@
 label.monitoring.updatecomment.save  =Save
 label.monitoring.updatecomment.posted.by  =Posted by
 label.monitoring.updatecomment.posted.on  =Posted on
+label.export.uploaded.by  =Uploaded by
+label.export.voted.for.this.image  =Voted for this image
+label.export.images  =Images
 message.monitoring.edit.activity.not.editable  =This Activity is no longer editable
 output.desc.learner.number.of.images.uploaded  =Number of images uploaded by user
 output.desc.learner.number.of.comments  =Number of comments posted by user
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java
===================================================================
diff -u -rd135b890fdc2d5b58c6bd02c48c8b3365d9a2ffe -r4b47f86b588e38c9e7e9f2760c75f775cb080831
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java	(.../ImageGalleryServiceImpl.java)	(revision d135b890fdc2d5b58c6bd02c48c8b3365d9a2ffe)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java	(.../ImageGalleryServiceImpl.java)	(revision 4b47f86b588e38c9e7e9f2760c75f775cb080831)
@@ -557,41 +557,42 @@
 	    return null;
 	}
 	
-	//imageList-->sessionList-->contributionList
+	//sessionList-->imageList-->contributionList
 	ImageGallery imageGallery = session.getImageGallery();
-	List<List<List<UserImageContributionDTO>>> imageList = new ArrayList();
+	List<List<List<UserImageContributionDTO>>> sessionList = new ArrayList();
+	List<List<UserImageContributionDTO>> imageList = new ArrayList();
+	sessionList.add(imageList);
 
-	Set<ImageGalleryItem> dbImages = imageGallery.getImageGalleryItems();
+	Set<ImageGalleryItem> dbImages = new TreeSet(new ImageGalleryItemComparator());
+	dbImages.addAll(getImagesForGroup(imageGallery, session.getSessionId()));
 	for (ImageGalleryItem image : dbImages) {
 	    if (skipHide && image.isHide()) {
 		continue;
 	    }
 
-	    List<List<UserImageContributionDTO>> sessionList = new ArrayList();
-	    
 	    List<UserImageContributionDTO> userContributionList = new ArrayList<UserImageContributionDTO>();
 
 	    Object[] ratingForGroup = getRatingForGroup(image.getUid(), session.getSessionId());
 	    UserImageContributionDTO userContribution = createUserContribution(image, user, session, ratingForGroup);
 	    userContribution.setImage(image);
 	    userContributionList.add(userContribution);
-	    sessionList.add(userContributionList);
-	    imageList.add(sessionList);
+	    imageList.add(userContributionList);
 	}
 
-	return imageList;
+	return sessionList;
     }
 
     public List<List<List<UserImageContributionDTO>>> exportByContentId(Long contentId) {
 	ImageGallery imageGallery = imageGalleryDao.getByContentId(contentId);
-	List<List<List<UserImageContributionDTO>>> imageList = new ArrayList();	
+	List<List<List<UserImageContributionDTO>>> sessionList = new ArrayList();	
 	
-	Set<ImageGalleryItem> dbImages = imageGallery.getImageGalleryItems();
-	for (ImageGalleryItem image : dbImages) {
+	List<ImageGallerySession> imageGallerySessionList = imageGallerySessionDao.getByContentId(contentId);
+	for(ImageGallerySession imageSession : imageGallerySessionList) {
 
-	    List<List<UserImageContributionDTO>> sessionList = new ArrayList();
-	    List<ImageGallerySession> imageGallerySessionList = imageGallerySessionDao.getByContentId(contentId);
-	    for(ImageGallerySession imageSession : imageGallerySessionList) {
+	    List<List<UserImageContributionDTO>> imageList = new ArrayList();
+	    Set<ImageGalleryItem> dbImages = new TreeSet(new ImageGalleryItemComparator());
+	    dbImages.addAll(imageGallery.getImageGalleryItems());
+	    for (ImageGalleryItem image : dbImages) {
 		List<UserImageContributionDTO> userContributionList = new ArrayList<UserImageContributionDTO>();
 		Object[] ratingForGroup = getRatingForGroup(image.getUid(), imageSession.getSessionId());
 		
@@ -601,14 +602,14 @@
 		    userContribution.setImage(image);
 		    userContributionList.add(userContribution);		    
 		}
-		sessionList.add(userContributionList);
+		imageList.add(userContributionList);
 		
 	    }
 
-	    imageList.add(sessionList);
+	    sessionList.add(imageList);
 	}	
 
-	return imageList;
+	return sessionList;
     }
 
     public void uploadImageGalleryItemFile(ImageGalleryItem image, FormFile file)
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/util/ImageGalleryBundler.java
===================================================================
diff -u
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/util/ImageGalleryBundler.java	(revision 0)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/util/ImageGalleryBundler.java	(revision 4b47f86b588e38c9e7e9f2760c75f775cb080831)
@@ -0,0 +1,119 @@
+/**************************************************************** 
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) 
+ * ============================================================= 
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/ 
+ * 
+ * This program is free software; you can redistribute it and/or modify 
+ * it under the terms of the GNU General Public License version 2.0 
+ * as published by the Free Software Foundation. 
+ * 
+ * This program is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * GNU General Public License for more details. 
+ * 
+ * You should have received a copy of the GNU General Public License 
+ * along with this program; if not, write to the Free Software 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA 
+ * 
+ * http://www.gnu.org/licenses/gpl.txt 
+ * **************************************************************** 
+ */
+
+/* $Id$ */
+package org.lamsfoundation.lams.tool.imageGallery.util;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+
+import org.lamsfoundation.lams.learning.export.web.action.Bundler;
+import org.lamsfoundation.lams.tool.imageGallery.ImageGalleryConstants;
+import org.lamsfoundation.lams.util.Configuration;
+import org.lamsfoundation.lams.util.ConfigurationKeys;
+import org.lamsfoundation.lams.util.HttpUrlConnectionUtil;
+
+public class ImageGalleryBundler extends Bundler {
+
+    public ImageGalleryBundler() {
+    }
+
+    /**
+     * This method bundles the files to the given output dir
+     * 
+     * @param request
+     *            the request for the export
+     * @param cookies
+     *            cookies for the request
+     * @param outputDirectory
+     *            the location where the files should be written
+     * @throws Exception
+     */
+    public void bundle(HttpServletRequest request, Cookie[] cookies, String outputDirectory) throws Exception {
+	bundleViaHTTP(request, cookies, outputDirectory);
+    }
+
+    /**
+     * See bundle
+     * 
+     * @param request
+     * @param cookies
+     * @param outputDirectory
+     * @throws MalformedURLException
+     * @throws FileNotFoundException
+     * @throws IOException
+     */
+    private void bundleViaHTTP(HttpServletRequest request, Cookie[] cookies, String outputDirectory)
+	    throws MalformedURLException, FileNotFoundException, IOException {
+
+	String[] directoriesNames = { "css", "javascript", "images"};
+
+	List<String> directories = new ArrayList<String>();
+	for (String directoryName : directoriesNames) {
+	    directories.add(outputDirectory + File.separator + directoryName);
+	}
+	this.createDirectories(directories);
+
+	String urlToConnectTo = getImagesUrlDir() + File.separator + "javascript" + File.separator + "jquery.rating.1.1.js";
+	String directoryToStoreFile = outputDirectory + File.separator + "javascript";
+	HttpUrlConnectionUtil.writeResponseToFile(urlToConnectTo, directoryToStoreFile, "jquery.rating.1.1.js", cookies); 
+	log.debug("Copying image from source: " + urlToConnectTo + "to desitnation: " + directoryToStoreFile);
+
+	urlToConnectTo = getImagesUrlDir() + File.separator + "javascript" + File.separator + "jquery-1.2.6.pack.js";
+	directoryToStoreFile = outputDirectory + File.separator + "javascript";
+	HttpUrlConnectionUtil.writeResponseToFile(urlToConnectTo, directoryToStoreFile, "jquery-1.2.6.pack.js", cookies); 
+	log.debug("Copying image from source: " + urlToConnectTo + "to desitnation: " + directoryToStoreFile);
+	
+	urlToConnectTo = getImagesUrlDir() + File.separator + "css" + File.separator + "jquery.rating.css";
+	directoryToStoreFile = outputDirectory + File.separator + "css";
+	HttpUrlConnectionUtil.writeResponseToFile(urlToConnectTo, directoryToStoreFile, "jquery.rating.css", cookies); 
+	log.debug("Copying image from source: " + urlToConnectTo + "to desitnation: " + directoryToStoreFile);
+	
+	urlToConnectTo = getImagesUrlDir() + File.separator + "images" + File.separator + "star.gif";
+	directoryToStoreFile = outputDirectory + File.separator + "images";
+	HttpUrlConnectionUtil.writeResponseToFile(urlToConnectTo, directoryToStoreFile, "star.gif", cookies); 
+	log.debug("Copying image from source: " + urlToConnectTo + "to desitnation: " + directoryToStoreFile);
+
+    }
+
+    private String getImagesUrlDir() {
+	String imageGalleryUrlPath = Configuration.get(ConfigurationKeys.SERVER_URL);
+	if (imageGalleryUrlPath == null) {
+	    log.error("Unable to get path to the LAMS ImageGallery URL from the configuration table. ImageGallery javascript files export failed");
+	    return "";
+	} else {
+	    imageGalleryUrlPath = imageGalleryUrlPath + File.separator + "tool" + File.separator
+		    + ImageGalleryConstants.TOOL_SIGNATURE + File.separator + "includes";
+	    return imageGalleryUrlPath;
+	}
+    }
+
+}
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/servlet/ExportServlet.java
===================================================================
diff -u -r7dac65b89adddab2b602b5d57d8e3ddd4cab2060 -r4b47f86b588e38c9e7e9f2760c75f775cb080831
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/servlet/ExportServlet.java	(.../ExportServlet.java)	(revision 7dac65b89adddab2b602b5d57d8e3ddd4cab2060)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/servlet/ExportServlet.java	(.../ExportServlet.java)	(revision 4b47f86b588e38c9e7e9f2760c75f775cb080831)
@@ -55,6 +55,7 @@
 import org.lamsfoundation.lams.tool.imageGallery.service.IImageGalleryService;
 import org.lamsfoundation.lams.tool.imageGallery.service.ImageGalleryException;
 import org.lamsfoundation.lams.tool.imageGallery.service.ImageGalleryServiceProxy;
+import org.lamsfoundation.lams.tool.imageGallery.util.ImageGalleryBundler;
 import org.lamsfoundation.lams.tool.imageGallery.util.ImageGalleryToolContentHandler;
 import org.lamsfoundation.lams.tool.imageGallery.util.ReflectDTOComparator;
 import org.lamsfoundation.lams.util.FileUtil;
@@ -109,6 +110,16 @@
 
 	String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort()
 		+ request.getContextPath();
+	
+	// Attempting to export required images
+	try {
+	    ImageGalleryBundler imageBundler = new ImageGalleryBundler();
+	    imageBundler.bundle(request, cookies, directoryName);
+	} catch (Exception e) {
+	    logger.error(
+		    "Could not export spreadsheet javascript files, some files may be missing in export portfolio", e);
+	}
+	
 	writeResponseToFile(basePath + "/pages/export/exportportfolio.jsp?sessionMapID=" + sessionMap.getSessionID(),
 		directoryName, FILENAME, cookies);
 
@@ -180,6 +191,7 @@
 	    sessionMap.put(ImageGalleryConstants.ATTR_REFLECT_LIST, map);
 	}
 
+	// put it into HTTPSession
 	sessionMap.put(ImageGalleryConstants.ATTR_RESOURCE, content);
 	sessionMap.put(ImageGalleryConstants.ATTR_TITLE, content.getTitle());
 	sessionMap.put(ImageGalleryConstants.ATTR_INSTRUCTIONS, content.getInstructions());
@@ -230,11 +242,11 @@
      * @param directoryName
      * @throws IOException
      */
-    private void saveFileToLocal(List<List<List<UserImageContributionDTO>>> exportImageList, String directoryName) {
+    private void saveFileToLocal(List<List<List<UserImageContributionDTO>>> sessionList, String directoryName) {
 	handler = getToolContentHandler();
 
-	for (List<List<UserImageContributionDTO>> sessionList : exportImageList) {
-	    for (List<UserImageContributionDTO> userContributionList : sessionList) {
+	for (List<List<UserImageContributionDTO>> imageList : sessionList) {
+	    for (List<UserImageContributionDTO> userContributionList : imageList) {
 		for (UserImageContributionDTO userContribution : userContributionList) {
 		    try {
 			ImageGalleryItem image = userContribution.getImage();
@@ -250,17 +262,17 @@
 			    }
 			    idx++;
 			}
-			image.setAttachmentLocalUrl(userName + "/" + idx + "/" + image.getThumbnailFileUuid() + '.'
+			image.setAttachmentLocalUrl(userName + "/" + idx + "/" + image.getMediumFileUuid() + '.'
 				+ FileUtil.getFileExtension(image.getFileName()));
-			handler.saveFile(image.getThumbnailFileUuid(), FileUtil.getFullPath(directoryName, image
+			handler.saveFile(image.getMediumFileUuid(), FileUtil.getFullPath(directoryName, image
 				.getAttachmentLocalUrl()));
 		    } catch (Exception e) {
 			logger.error("Export forum topic attachment failed: " + e.toString());
 		    }
 		    break;
 		}
-		break;
 	    }
+	    break;
 	}
 
     }
Fisheye: Tag 4b47f86b588e38c9e7e9f2760c75f775cb080831 refers to a dead (removed) revision in file `lams_tool_images/web/pages/export/exportimage.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_images/web/pages/export/exportimagelearner.jsp
===================================================================
diff -u
--- lams_tool_images/web/pages/export/exportimagelearner.jsp	(revision 0)
+++ lams_tool_images/web/pages/export/exportimagelearner.jsp	(revision 4b47f86b588e38c9e7e9f2760c75f775cb080831)
@@ -0,0 +1,92 @@
+<fmt:message key="label.export.images" />
+
+<div style="margin-left: 20px; margin-top: 20px;">
+
+	<c:forEach var="userContributionList" items="${imageList}" varStatus="status">
+		<c:set var="userContribution" value="${userContributionList[0]}"/>
+		<c:set var="image" value="${userContribution.image}"/>
+
+		<table>
+			<tr>
+				<td 
+				<c:if test="${image.createByAuthor || (image.createBy == null)}">colspan="2"</c:if>
+				 >
+					<h2>
+						<c:out value="${image.title}"></c:out>
+					</h2>
+				</td>
+				<c:if test="${!image.createByAuthor && image.createBy != null}">
+					<td style="align:left;">	
+						<h2>
+							<fmt:message key="label.export.uploaded.by" />: <c:out value="${image.createBy.loginName}"></c:out>
+						</h2>
+					</td>
+				</c:if>
+				
+			</tr>		
+			<tr>
+				<td colspan="2">	
+					<h2>
+						<c:out value="${image.description}" escapeXml="false"></c:out>
+					</h2>
+				</td>
+			</tr>	
+		</table>	
+		<br>
+		
+		<c:choose>
+			<c:when test="${imageGallery.allowRank == true}">
+				<div>
+					<c:forEach var="i" begin="1" end="5">
+						<input class="star" type="radio" name="rating${image.uid}" value="${i}"
+							title = "<fmt:message key='label.learning.average.rating'/> ${userContribution.averageRating}"
+							<c:if test="${userContribution.rating == i}"> checked = 'checked' </c:if>
+						/>
+					</c:forEach>
+				</div>
+				<p>
+					<span id="numberRatings">${userContribution.numberRatings}</span>
+					<fmt:message key="label.learning.ratings" />
+				</p>
+			</c:when>
+			
+			<c:when test="${imageGallery.allowVote == true}">
+				<fmt:message key="label.export.voted.for.this.image" />: ${userContribution.votedForThisImage}
+				<br>						
+			</c:when>
+		</c:choose>
+		
+		<br>
+		<div>	
+			<img src="${image.attachmentLocalUrl}"	border="0">	
+		</div>
+		<br>
+		
+		<c:forEach var="comment" items="${userContribution.comments}">
+			<div>
+				<table cellspacing="0" class="forum" style="width: 50%;">
+					<tr >
+						<th >
+							<fmt:message key="label.learning.by" />
+							<c:set var="author" value="${comment.createBy.loginName}" />
+							${author}
+									-				
+							<lams:Date value="${comment.createDate}" />
+						</th>
+					</tr>
+					
+					<tr>
+						<td>
+							<c:out value="${comment.comment}" escapeXml="false" />
+						</td>
+					</tr>
+						
+				</table>
+			</div>
+		</c:forEach>
+		
+		<br>
+		<c:if test="${! status.last}"><hr></c:if> 
+		
+	</c:forEach>
+</div>		
\ No newline at end of file
Index: lams_tool_images/web/pages/export/exportimageteacher.jsp
===================================================================
diff -u
--- lams_tool_images/web/pages/export/exportimageteacher.jsp	(revision 0)
+++ lams_tool_images/web/pages/export/exportimageteacher.jsp	(revision 4b47f86b588e38c9e7e9f2760c75f775cb080831)
@@ -0,0 +1,142 @@
+<c:set var="userContributionList2" value="${imageList[0]}"/>
+<c:set var="userContribution2" value="${userContributionList2[0]}"/>
+
+<h1>
+	<fmt:message key="monitoring.label.group" /> ${userContribution2.sessionName} 
+</h1>
+
+<div style="margin-left: 20px; margin-top: 20px;">
+
+	<c:forEach var="userContributionList" items="${imageList}" varStatus="status">
+		<c:set var="userContribution" value="${userContributionList[0]}"/>
+		<c:set var="image" value="${userContribution.image}"/>
+
+		<table>
+			<tr>
+				<td 
+				<c:if test="${image.createByAuthor || (image.createBy == null)}">colspan="2"</c:if>
+				 >
+					<h2>
+						<c:out value="${image.title}"></c:out>
+					</h2>
+				</td>
+				<c:if test="${!image.createByAuthor && image.createBy != null}">
+					<td style="align:left;">	
+						<h2>
+							<fmt:message key="label.export.uploaded.by" />: <c:out value="${image.createBy.loginName}"></c:out>
+						</h2>
+					</td>
+				</c:if>
+				
+			</tr>		
+			<tr>
+				<td colspan="2">	
+					<h2>
+						<c:out value="${image.description}" escapeXml="false"></c:out>
+					</h2>
+				</td>
+			</tr>	
+		</table>	
+		<br>
+
+		<c:choose>
+			<c:when test="${imageGallery.allowRank == true}">
+				<div>
+					<c:forEach var="i" begin="1" end="5">
+						<input class="star" type="radio" name="rating${image.uid}${userContribution2.sessionName}" value="${i}"
+							title = "<fmt:message key='label.learning.average.rating'/> ${userContribution.averageRating}"
+							<c:if test="${(userContribution.averageRating - userContribution.averageRating % 1) == i}"> checked = 'checked' </c:if>
+						/>
+					</c:forEach>
+				</div>
+				<p>
+					<span id="numberRatings">${userContribution.numberRatings}</span>
+					<fmt:message key="label.learning.ratings" />
+				</p>
+			</c:when>
+			
+			<c:when test="${imageGallery.allowVote == true}">
+				<fmt:message key="label.monitoring.number.votes" />: ${userContribution.numberOfVotesForImage}
+				<br>						
+			</c:when>
+		</c:choose>	
+		
+		<br>
+		<div>	
+			<img src="${image.attachmentLocalUrl}"	border="0">	
+		</div>
+		<br>
+		
+		
+		<table cellpadding="0" class="alternative-color" >
+			<tr>
+				<th width="100px">
+					<fmt:message key="label.monitoring.imagesummary.user" />
+				</th>
+				<c:if test="${imageGallery.allowVote}">				
+					<th style="padding-left:0px; text-align:center; width: 100px;">
+						<fmt:message key="label.monitoring.imagesummary.voted.for.this.image" />
+					</th>
+				</c:if>
+				<c:if test="${imageGallery.allowRank}">					
+					<th width="50px">
+						<fmt:message key="label.monitoring.imagesummary.rating" />
+					</th>
+				</c:if>						
+				<c:if test="${imageGallery.allowCommentImages}">
+					<th >
+						<fmt:message key="label.monitoring.imagesummary.comments" />
+					</th>
+				</c:if>			
+			</tr>
+						
+			<c:forEach var="userContribution" items="${userContributionList}">
+							
+				<tr>
+					<td>
+						${userContribution.user.loginName}
+					</td>
+							
+					<c:if test="${imageGallery.allowVote}">								
+						<td style="padding-left:0px; text-align:center;">
+							<c:choose>
+								<c:when test="${userContribution.votedForThisImage}">
+									<img src="../images/tick.gif"	border="0">
+								</c:when>
+													
+								<c:otherwise>
+									<img src="../images/dash.gif" border="0">
+								</c:otherwise>
+							</c:choose>
+						</td>
+					</c:if>
+									
+					<c:if test="${imageGallery.allowRank}">								
+						<td style="padding-left:0px; text-align:center;">
+							${userContribution.rating}
+						</td>
+					</c:if>
+												
+					<c:if test="${imageGallery.allowCommentImages}">
+						<td>
+										
+							<ul>
+								<c:forEach var="comment" items="${userContribution.comments}">
+									<li>
+										<c:out value="${comment.comment}" escapeXml="false" />
+									</li>
+								</c:forEach>
+							</ul>
+											
+						</td>
+					</c:if>
+										
+				</tr>
+										
+								
+			</c:forEach>
+		</table>
+		
+		<p></p>
+	</c:forEach>
+</div>		
\ No newline at end of file
Index: lams_tool_images/web/pages/export/exportportfolio.jsp
===================================================================
diff -u -r7dac65b89adddab2b602b5d57d8e3ddd4cab2060 -r4b47f86b588e38c9e7e9f2760c75f775cb080831
--- lams_tool_images/web/pages/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision 7dac65b89adddab2b602b5d57d8e3ddd4cab2060)
+++ lams_tool_images/web/pages/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision 4b47f86b588e38c9e7e9f2760c75f775cb080831)
@@ -4,7 +4,7 @@
 <c:set var="sessionMapID" value="${param.sessionMapID}"/>
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
 <c:set var="imageGallery" value="${sessionMap.imageGallery}"/>
-<c:set var="exportImageList" value="${sessionMap.exportImageList}"/>
+<c:set var="sessionList" value="${sessionMap.exportImageList}"/>
 <c:set var="mode" value="${sessionMap.mode}"/>
 <c:set var="title" value="${sessionMap.title}"/>
 
@@ -14,6 +14,18 @@
 		<c:set var="lams">
 			<lams:LAMSURL />
 		</c:set>
+		
+		<script type="text/javascript" src="./javascript/jquery-1.2.6.pack.js" ></script>
+	 	<script type="text/javascript" src="./javascript/jquery.rating.1.1.js"></script>
+	 	<link rel="stylesheet" type="text/css" href="./css/jquery.rating.css"/>
+	 	
+	 	<script type="text/javascript">
+			$(document).ready(function(){
+		 		$('input[@type=radio].star').rating({
+					readOnly: true
+				});
+			});
+		</script>
 	
 		<lams:css localLinkPath="../"/>
 	</lams:head>
@@ -23,16 +35,27 @@
 		<div id="content">
 	
 			<h1>${title} </h1>
+			
+			<h1>${instructions} </h1>
 	
-			<c:set var="sessionList" value="${exportImageList[0]}"/>
 			<c:choose>
 				<c:when test="${not empty sessionList}">
 				
 					<table border="0" cellspacing="3" width="98%">
-						<c:forEach var="sessionList" items="${exportImageList}">
+						<c:forEach var="imageList" items="${sessionList}">
 							<tr>
 								<td>
-									<%@ include file="exportimage.jsp"%>
+									<c:choose>
+										<c:when test="${mode == 'learner'}">
+											<%@ include file="exportimagelearner.jsp"%>
+										</c:when>
+										
+										<c:when test="${mode == 'teacher'}">
+											<c:if test="${not empty imageList}">
+												<%@ include file="exportimageteacher.jsp"%>
+											</c:if>
+										</c:when>
+									</c:choose>								
 								</td>
 							</tr>
 						</c:forEach>