Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/ImageGalleryConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/ImageGalleryConstants.java,v
diff -u -r1.17 -r1.17.2.1
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/ImageGalleryConstants.java	17 Jan 2014 21:44:57 -0000	1.17
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/ImageGalleryConstants.java	30 Oct 2014 18:22:02 -0000	1.17.2.1
@@ -25,7 +25,7 @@
 
 public class ImageGalleryConstants {
     public static final String TOOL_SIGNATURE = "laimag10";
-    public static final String RESOURCE_SERVICE = "laimagImageGalleryService";
+    public static final String IMAGE_GALLERY_SERVICE = "laimagImageGalleryService";
     public static final String TOOL_CONTENT_HANDLER_NAME = "laimagImageGalleryToolContentHandler";
     public static final int COMPLETED = 1;
 
@@ -53,21 +53,20 @@
     // for request attribute name
     public static final String ATTR_TOOL_CONTENT_ID = "toolContentID";
     public static final String ATTR_TOOL_SESSION_ID = "toolSessionID";
-    public static final String ATTR_RESOURCE_ITEM_LIST = "imageGalleryList";
-    public static final String ATTR_DELETED_RESOURCE_ITEM_LIST = "deleteImageGalleryList";
-    public static final String ATTR_DELETED_RESOURCE_ITEM_ATTACHMENT_LIST = "deletedItemAttachmmentList";;
-    public static final String ATTR_RESOURCE = "imageGallery";
+    public static final String ATTR_IMAGE_LIST = "imageGalleryList";
+    public static final String ATTR_DELETED_IMAGE_LIST = "deleteImageGalleryList";
+    public static final String ATTR_DELETED_IMAGE_ATTACHMENT_LIST = "deletedItemAttachmmentList";;
+    public static final String ATTR_IMAGE_GALLERY = "imageGallery";
     public static final String ATTR_IMAGE = "image";
-    public static final String ATTR_RESOURCE_ITEM_UID = "itemUid";
+    public static final String ATTR_ITEM_UID = "itemUid";
     public static final String ATTR_NEXT_ACTIVITY_URL = "nextActivityUrl";
     public static final String ATTR_SUMMARY_LIST = "summaryList";
     public static final String ATTR_EXPORT_IMAGE_LIST = "exportImageList";
     public static final String ATTR_IMAGE_SUMMARY = "imageSummary";
-    public static final String ATTR_RESOURCE_INSTRUCTION = "instructions";
     public static final String ATTR_FINISH_LOCK = "finishedLock";
     public static final String ATTR_LOCK_ON_FINISH = "lockOnFinish";
     public static final String ATTR_SESSION_MAP_ID = "sessionMapID";
-    public static final String ATTR_RESOURCE_FORM = "imageGalleryForm";
+    public static final String ATTR_IMAGE_GALLERY_FORM = "imageGalleryForm";
     public static final String ATTR_NEXT_IMAGE_TITLE = "nextImageTitle";
     public static final String ATTR_FILE_TYPE_FLAG = "fileTypeFlag";
     public static final String ATTR_TITLE = "title";
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItem.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItem.java,v
diff -u -r1.14 -r1.14.2.1
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItem.java	4 Feb 2014 23:22:22 -0000	1.14
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItem.java	30 Oct 2014 18:22:02 -0000	1.14.2.1
@@ -80,17 +80,20 @@
     
     //Set of user comments
     private Set comments;
-    
-    //*************** NON Persist Field (only for exporting) ********************
+
+    // *************** NON Persist Fields  ********************
     private String attachmentLocalUrl;
 
-    // *************** NON Persist Fields (used only for export needs) ********************
     private ImageGalleryAttachment originalFile;
 
     private ImageGalleryAttachment mediumFile;
 
     private ImageGalleryAttachment thumbnailFile;
     
+    private String titleEscaped;
+
+    private String descriptionEscaped;
+    
     /**
      * Default contruction method.
      * 
@@ -383,7 +386,7 @@
 	this.comments = comments;
     }
     
-    // *************** NON Persist Fields (used only for export needs) ********************
+    // *************** NON Persist Fields ********************
     
     public ImageGalleryAttachment getOriginalFile() {
 	return originalFile;
@@ -415,4 +418,20 @@
     public void setAttachmentLocalUrl(String attachmentLocalUrl) {
         this.attachmentLocalUrl = attachmentLocalUrl;
     }
+    
+    public String getTitleEscaped() {
+	return titleEscaped;
+    }
+
+    public void setTitleEscaped(String titleEscaped) {
+	this.titleEscaped = titleEscaped;
+    }
+
+    public String getDescriptionEscaped() {
+	return descriptionEscaped;
+    }
+
+    public void setDescriptionEscaped(String descriptionEscaped) {
+	this.descriptionEscaped = descriptionEscaped;
+    }
 }
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceProxy.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceProxy.java,v
diff -u -r1.1 -r1.1.12.1
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceProxy.java	11 Oct 2008 12:04:14 -0000	1.1
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceProxy.java	30 Oct 2014 18:22:02 -0000	1.1.12.1
@@ -63,7 +63,7 @@
 
     private static Object getImageGalleryDomainService(ServletContext servletContext) {
 	WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(servletContext);
-	return wac.getBean(ImageGalleryConstants.RESOURCE_SERVICE);
+	return wac.getBean(ImageGalleryConstants.IMAGE_GALLERY_SERVICE);
     }
 
 }
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java,v
diff -u -r1.9 -r1.9.2.1
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java	17 Jan 2014 21:44:57 -0000	1.9
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java	30 Oct 2014 18:22:02 -0000	1.9.2.1
@@ -224,7 +224,7 @@
 	imageGalleryItemList.clear();
 	imageGalleryItemList.addAll(items);
 
-	sessionMap.put(ImageGalleryConstants.ATTR_RESOURCE_FORM, imageGalleryForm);
+	sessionMap.put(ImageGalleryConstants.ATTR_IMAGE_GALLERY_FORM, imageGalleryForm);
 	sessionMap.put(ImageGalleryConstants.ATTR_NEXT_IMAGE_TITLE, imageGallery.getNextImageTitle());
 	request.getSession().setAttribute(AttributeNames.PARAM_NOTIFY_CLOSE_URL,
 		request.getParameter(AttributeNames.PARAM_NOTIFY_CLOSE_URL));
@@ -245,7 +245,7 @@
 	    HttpServletResponse response) throws ServletException {
 	String sessionMapID = WebUtil.readStrParam(request, ImageGalleryConstants.ATTR_SESSION_MAP_ID);
 	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
-	ImageGalleryForm existForm = (ImageGalleryForm) sessionMap.get(ImageGalleryConstants.ATTR_RESOURCE_FORM);
+	ImageGalleryForm existForm = (ImageGalleryForm) sessionMap.get(ImageGalleryConstants.ATTR_IMAGE_GALLERY_FORM);
 
 	ImageGalleryForm imageGalleryForm = (ImageGalleryForm) form;
 	try {
@@ -648,7 +648,7 @@
     private IImageGalleryService getImageGalleryService() {
 	WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet()
 		.getServletContext());
-	return (IImageGalleryService) wac.getBean(ImageGalleryConstants.RESOURCE_SERVICE);
+	return (IImageGalleryService) wac.getBean(ImageGalleryConstants.IMAGE_GALLERY_SERVICE);
     }
 
     /**
@@ -659,10 +659,10 @@
      */
     private SortedSet<ImageGalleryItem> getImageList(SessionMap sessionMap) {
 	SortedSet<ImageGalleryItem> list = (SortedSet<ImageGalleryItem>) sessionMap
-		.get(ImageGalleryConstants.ATTR_RESOURCE_ITEM_LIST);
+		.get(ImageGalleryConstants.ATTR_IMAGE_LIST);
 	if (list == null) {
 	    list = new TreeSet<ImageGalleryItem>(new ImageGalleryItemComparator());
-	    sessionMap.put(ImageGalleryConstants.ATTR_RESOURCE_ITEM_LIST, list);
+	    sessionMap.put(ImageGalleryConstants.ATTR_IMAGE_LIST, list);
 	}
 	return list;
     }
@@ -674,7 +674,7 @@
      * @return
      */
     private List getDeletedImageGalleryItemList(SessionMap sessionMap) {
-	return getListFromSession(sessionMap, ImageGalleryConstants.ATTR_DELETED_RESOURCE_ITEM_LIST);
+	return getListFromSession(sessionMap, ImageGalleryConstants.ATTR_DELETED_IMAGE_LIST);
     }
 
     /**
@@ -686,7 +686,7 @@
      * @return
      */
     private List getDeletedItemAttachmentList(SessionMap sessionMap) {
-	return getListFromSession(sessionMap, ImageGalleryConstants.ATTR_DELETED_RESOURCE_ITEM_ATTACHMENT_LIST);
+	return getListFromSession(sessionMap, ImageGalleryConstants.ATTR_DELETED_IMAGE_ATTACHMENT_LIST);
     }
 
     /**
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.27 -r1.27.2.1
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java	10 Mar 2014 22:39:27 -0000	1.27
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java	30 Oct 2014 18:22:02 -0000	1.27.2.1
@@ -35,6 +35,7 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
+import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.math.NumberUtils;
 import org.apache.log4j.Logger;
@@ -197,7 +198,7 @@
 
 	// basic information
 	sessionMap.put(ImageGalleryConstants.ATTR_TITLE, imageGallery.getTitle());
-	sessionMap.put(ImageGalleryConstants.ATTR_RESOURCE_INSTRUCTION, imageGallery.getInstructions());
+	sessionMap.put(ImageGalleryConstants.ATTR_INSTRUCTIONS, imageGallery.getInstructions());
 	sessionMap.put(ImageGalleryConstants.ATTR_FINISH_LOCK, lock);
 	sessionMap.put(ImageGalleryConstants.ATTR_LOCK_ON_FINISH, imageGallery.getLockWhenFinished());
 	sessionMap.put(ImageGalleryConstants.ATTR_USER_FINISHED,
@@ -238,21 +239,31 @@
 	if (mode.isLearner()) {
 	    Set<ImageGalleryItem> groupImages = service.getImagesForGroup(imageGallery, sessionId);
 	    for (ImageGalleryItem image : groupImages) {
+		
 		// initialize login name to avoid session close error in proxy object
 		if (image.getCreateBy() != null) {
 		    image.getCreateBy().getLoginName();
 		}
+		
 		// remove hidden items
 		if (!image.isHide()) {
 		    images.add(image);
-		}
+		}	
 	    }
 	} 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_RESOURCE_ITEM_LIST, images);
-	sessionMap.put(ImageGalleryConstants.ATTR_RESOURCE, imageGallery);
+	sessionMap.put(ImageGalleryConstants.ATTR_IMAGE_LIST, images);
+	sessionMap.put(ImageGalleryConstants.ATTR_IMAGE_GALLERY, imageGallery);
 
 	return mapping.findForward(ImageGalleryConstants.SUCCESS);
     }
@@ -732,7 +743,7 @@
     private IImageGalleryService getImageGalleryService() {
 	WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet()
 		.getServletContext());
-	return (IImageGalleryService) wac.getBean(ImageGalleryConstants.RESOURCE_SERVICE);
+	return (IImageGalleryService) wac.getBean(ImageGalleryConstants.IMAGE_GALLERY_SERVICE);
     }
 
     private ImageGalleryUser getCurrentUser(IImageGalleryService service, Long sessionId) {
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/MonitoringAction.java,v
diff -u -r1.9 -r1.9.2.1
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/MonitoringAction.java	17 Jan 2014 21:44:57 -0000	1.9
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/MonitoringAction.java	30 Oct 2014 18:22:02 -0000	1.9.2.1
@@ -150,7 +150,7 @@
 	sessionMap.put(ImageGalleryConstants.ATTR_IS_GROUPED_ACTIVITY, isGroupedActivity);
 	sessionMap.put(ImageGalleryConstants.ATTR_SUMMARY_LIST, groupList);
 	sessionMap.put(ImageGalleryConstants.PAGE_EDITABLE, imageGallery.isContentInUse());
-	sessionMap.put(ImageGalleryConstants.ATTR_RESOURCE, imageGallery);
+	sessionMap.put(ImageGalleryConstants.ATTR_IMAGE_GALLERY, imageGallery);
 	sessionMap.put(ImageGalleryConstants.ATTR_TOOL_CONTENT_ID, contentId);
 	sessionMap.put(ImageGalleryConstants.ATTR_REFLECT_LIST, reflectList);
 
@@ -283,7 +283,7 @@
 	String sessionMapID = WebUtil.readStrParam(request, ImageGalleryConstants.ATTR_SESSION_MAP_ID);
 	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
 	Long contentId = (Long) sessionMap.get(ImageGalleryConstants.ATTR_TOOL_CONTENT_ID);
-	ImageGallery imageGallery = (ImageGallery) sessionMap.get(ImageGalleryConstants.ATTR_RESOURCE);
+	ImageGallery imageGallery = (ImageGallery) sessionMap.get(ImageGalleryConstants.ATTR_IMAGE_GALLERY);
 	Long imageUid = new Long(request.getParameter(ImageGalleryConstants.PARAM_IMAGE_UID));
 	ImageGalleryItem image =getImageGalleryService().getImageGalleryItemByUid(imageUid);
 	
@@ -292,7 +292,7 @@
 	    request.setAttribute(ImageGalleryConstants.ATTR_IMAGE_SUMMARY, imageSummary);
 	}
 	request.setAttribute(ImageGalleryConstants.ATTR_IMAGE, image);
-	sessionMap.put(ImageGalleryConstants.ATTR_RESOURCE_ITEM_UID, imageUid);
+	sessionMap.put(ImageGalleryConstants.ATTR_ITEM_UID, imageUid);
 	request.setAttribute(ImageGalleryConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());	
 	
 	ImageGalleryItemForm imageForm = (ImageGalleryItemForm) form;
@@ -469,7 +469,7 @@
 	Long commentUid = new Long(request.getParameter(ImageGalleryConstants.ATTR_COMMENT_UID));
 	ImageComment comment = service.getImageCommentByUid(commentUid);
 	
-	Long imageUid = (Long) sessionMap.get(ImageGalleryConstants.ATTR_RESOURCE_ITEM_UID);
+	Long imageUid = (Long) sessionMap.get(ImageGalleryConstants.ATTR_ITEM_UID);
 	ImageGalleryItem image = service.getImageGalleryItemByUid(imageUid);
 	Set<ImageComment> dbComments = image.getComments();
 	dbComments.remove(comment);
@@ -513,7 +513,7 @@
     private IImageGalleryService getImageGalleryService() {
 	WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet()
 		.getServletContext());
-	return (IImageGalleryService) wac.getBean(ImageGalleryConstants.RESOURCE_SERVICE);
+	return (IImageGalleryService) wac.getBean(ImageGalleryConstants.IMAGE_GALLERY_SERVICE);
     }
     
     /**
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/servlet/ExportServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/servlet/ExportServlet.java,v
diff -u -r1.8 -r1.8.2.1
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/servlet/ExportServlet.java	17 Jan 2014 21:44:57 -0000	1.8
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/servlet/ExportServlet.java	30 Oct 2014 18:22:02 -0000	1.8.2.1
@@ -170,7 +170,7 @@
 	}
 
 	// put it into HTTPSession
-	sessionMap.put(ImageGalleryConstants.ATTR_RESOURCE, content);
+	sessionMap.put(ImageGalleryConstants.ATTR_IMAGE_GALLERY, content);
 	sessionMap.put(ImageGalleryConstants.ATTR_TITLE, content.getTitle());
 	sessionMap.put(ImageGalleryConstants.ATTR_INSTRUCTIONS, content.getInstructions());
 	sessionMap.put(ImageGalleryConstants.ATTR_EXPORT_IMAGE_LIST, exportImageList);
@@ -207,7 +207,7 @@
 	}
 
 	// put it into HTTPSession
-	sessionMap.put(ImageGalleryConstants.ATTR_RESOURCE, content);	
+	sessionMap.put(ImageGalleryConstants.ATTR_IMAGE_GALLERY, content);	
 	sessionMap.put(ImageGalleryConstants.ATTR_TITLE, content.getTitle());
 	sessionMap.put(ImageGalleryConstants.ATTR_INSTRUCTIONS, content.getInstructions());
 	sessionMap.put(ImageGalleryConstants.ATTR_EXPORT_IMAGE_LIST, exportImageList);
Index: lams_tool_images/web/common/header.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/common/header.jsp,v
diff -u -r1.1 -r1.1.12.1
--- lams_tool_images/web/common/header.jsp	11 Oct 2008 12:04:14 -0000	1.1
+++ lams_tool_images/web/common/header.jsp	30 Oct 2014 18:22:02 -0000	1.1.12.1
@@ -3,15 +3,13 @@
 <c:set var="tool"><lams:WebAppURL/></c:set>
 <c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request"/>
 
- 	<!-- ********************  CSS ********************** -->
-	<link href="<html:rewrite page='/includes/css/imageGallery.css'/>" rel="stylesheet" type="text/css">
-	<lams:css />
+ <!-- ********************  CSS ********************** -->
+<link href="<html:rewrite page='/includes/css/imageGallery.css'/>" rel="stylesheet" type="text/css">
+<lams:css />
 
+ <!-- ********************  javascript ********************** -->
+<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
+<script type="text/javascript" src="<html:rewrite page='/includes/javascript/imageGallerycommon.js'/>"></script>
+<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>    
 
- 	<!-- ********************  javascript ********************** -->
-	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/prototype.js"></script>
-	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/imageGallerycommon.js'/>"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>    
-
 	
Fisheye: Tag 1.1.12.1 refers to a dead (removed) revision in file `lams_tool_images/web/common/headerWithoutPrototype.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_tool_images/web/includes/css/fotorama.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.12.1 refers to a dead (removed) revision in file `lams_tool_images/web/includes/css/galleria.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.12.2 refers to a dead (removed) revision in file `lams_tool_images/web/includes/css/jquery.jcarousel.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2.12.1 refers to a dead (removed) revision in file `lams_tool_images/web/includes/css/jquery.jcarousel.skin.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_images/web/includes/images/fotorama.png
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/includes/images/fotorama.png,v
diff -u -r1.1.2.1 -r1.1.2.2
Binary files differ
Index: lams_tool_images/web/includes/images/fotorama@2x.png
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/includes/images/fotorama@2x.png,v
diff -u -r1.1.2.1 -r1.1.2.2
Binary files differ
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_tool_images/web/includes/javascript/fotorama.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.12.1 refers to a dead (removed) revision in file `lams_tool_images/web/includes/javascript/jquery.MetaData.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.3.2.1 refers to a dead (removed) revision in file `lams_tool_images/web/includes/javascript/jquery.galleria.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.12.1 refers to a dead (removed) revision in file `lams_tool_images/web/includes/javascript/jquery.jcarousel.pack.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_images/web/pages/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/authoring/authoring.jsp,v
diff -u -r1.6 -r1.6.2.1
--- lams_tool_images/web/pages/authoring/authoring.jsp	24 Apr 2014 20:39:10 -0000	1.6
+++ lams_tool_images/web/pages/authoring/authoring.jsp	30 Oct 2014 18:22:02 -0000	1.6.2.1
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 
 <%@ include file="/common/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.tool.imageGallery.ImageGalleryConstants"%>
Index: lams_tool_images/web/pages/authoring/definelater.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/authoring/definelater.jsp,v
diff -u -r1.3 -r1.3.2.1
--- lams_tool_images/web/pages/authoring/definelater.jsp	28 Oct 2013 13:17:15 -0000	1.3
+++ lams_tool_images/web/pages/authoring/definelater.jsp	30 Oct 2014 18:22:02 -0000	1.3.2.1
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 
 <%@ include file="/common/taglibs.jsp"%>
 <%@ page import="java.util.HashSet"%>
Index: lams_tool_images/web/pages/authoring/definelaterforbid.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/authoring/definelaterforbid.jsp,v
diff -u -r1.1 -r1.1.12.1
--- lams_tool_images/web/pages/authoring/definelaterforbid.jsp	11 Oct 2008 12:04:14 -0000	1.1
+++ lams_tool_images/web/pages/authoring/definelaterforbid.jsp	30 Oct 2014 18:22:01 -0000	1.1.12.1
@@ -1,6 +1,6 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+
 <%@ include file="/common/taglibs.jsp"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-            "http://www.w3.org/TR/html4/loose.dtd">
 <html:html locale="true">
 <lams:head>
 	<title><fmt:message key="label.author.title" /></title>
Index: lams_tool_images/web/pages/authoring/parts/addimage.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/authoring/parts/addimage.jsp,v
diff -u -r1.3.2.2 -r1.3.2.3
--- lams_tool_images/web/pages/authoring/parts/addimage.jsp	12 Sep 2014 21:07:21 -0000	1.3.2.2
+++ lams_tool_images/web/pages/authoring/parts/addimage.jsp	30 Oct 2014 18:22:02 -0000	1.3.2.3
@@ -1,11 +1,11 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-		"http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 		
 <%@ include file="/common/taglibs.jsp"%>
 
 <lams:html>
 	<lams:head>
 		<%@ include file="/common/header.jsp"%>
+		<script type="text/javascript" src="${lams}includes/javascript/prototype.js"></script>
 		<lams:css style="tabbed"/>
 
 		<script type="text/javascript">
Index: lams_tool_images/web/pages/authoring/parts/addmultipleimages.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/authoring/parts/addmultipleimages.jsp,v
diff -u -r1.1 -r1.1.10.1
--- lams_tool_images/web/pages/authoring/parts/addmultipleimages.jsp	25 Dec 2008 14:28:02 -0000	1.1
+++ lams_tool_images/web/pages/authoring/parts/addmultipleimages.jsp	30 Oct 2014 18:22:02 -0000	1.1.10.1
@@ -1,11 +1,11 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-		"http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 		
 <%@ include file="/common/taglibs.jsp"%>
 
 <lams:html>
 	<lams:head>
 		<%@ include file="/common/header.jsp"%>
+		<script type="text/javascript" src="${lams}includes/javascript/prototype.js"></script>
 		<lams:css style="tabbed"/>
 
 		<script type="text/javascript">
Index: lams_tool_images/web/pages/learning/definelater.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/learning/definelater.jsp,v
diff -u -r1.1 -r1.1.12.1
--- lams_tool_images/web/pages/learning/definelater.jsp	11 Oct 2008 12:04:14 -0000	1.1
+++ lams_tool_images/web/pages/learning/definelater.jsp	30 Oct 2014 18:22:02 -0000	1.1.12.1
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 
 <%@include file="/common/taglibs.jsp"%>
 
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.29.2.2 -r1.29.2.3
--- lams_tool_images/web/pages/learning/learning.jsp	18 Sep 2014 09:47:00 -0000	1.29.2.2
+++ lams_tool_images/web/pages/learning/learning.jsp	30 Oct 2014 18:22:02 -0000	1.29.2.3
@@ -1,13 +1,12 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 
 <%@ include file="/common/taglibs.jsp"%>
 <lams:html>
 <lams:head>
 	<title>
 		<fmt:message key="label.learning.title" />
 	</title>
-	<%@ include file="/common/headerWithoutPrototype.jsp"%>
+	<%@ include file="/common/header.jsp"%>
 
 	<%-- param has higher level for request attribute --%>
 	<c:if test="${not empty param.sessionMapID}">
@@ -20,154 +19,142 @@
 	<c:set var="finishedLock" value="${sessionMap.finishedLock}" />
 	<c:set var="mediumImageDimensions" value="${sessionMap.mediumImageDimensions}" />
 	<c:set var="thumbnailImageDimensions" value="${empty sessionMap.thumbnailImageDimensions ? 100 : sessionMap.thumbnailImageDimensions}" />
-	<c:set var="windowMinimumWidth" value="${thumbnailImageDimensions*5 + 160}" />
-	<c:if test="${imageGallery.allowShareImages && (mode != 'teacher')}">
-		<c:set var="windowMinimumWidth" value="${windowMinimumWidth + 120}" />
-	</c:if>
-	<c:if test="${(mediumImageDimensions + 200) > windowMinimumWidth}">
-		<c:set var="windowMinimumWidth" value="${mediumImageDimensions + 200}" />
-	</c:if>
 
-	<link rel="stylesheet" type="text/css" href="<html:rewrite page='/includes/css/jquery.jcarousel.css'/>" />
-	<link rel="stylesheet" type="text/css" href="<html:rewrite page='/includes/css/jquery.jcarousel.skin.css' />" />
-	<link rel="stylesheet" type="text/css" href="<html:rewrite page='/includes/css/galleria.css'/>" >
 	<link rel="stylesheet" type="text/css" href="<html:rewrite page='/includes/css/jquery.rating.css'/>"/>
-	<link href="<lams:LAMSURL/>css/thickbox.css" rel="stylesheet" type="text/css" media="screen">
+	<link rel="stylesheet" type="text/css" href="<lams:LAMSURL/>css/thickbox.css">
+	<link rel="stylesheet" type="text/css" href="<html:rewrite page='/includes/css/fotorama.css'/>"/>
 	<style media="screen,projection" type="text/css">
-		.galleria_container{position:relative;margin-top:2em;}
-		.gallery_demo{width:${mediumImageDimensions + 62}px;margin:0 auto 0 0;}
-		.gallery_demo li{width:${thumbnailImageDimensions}px;height:${thumbnailImageDimensions}px;border:3px double #111;margin: 0 2px;background:#000;}
-		.gallery_demo li div{left:240px}
-		.gallery_demo li div .caption{font:italic 0.7em/1.4 georgia,serif;}
-		
-		.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;}
-		#delete_button{position:absolute; top:10px; left:1000px; z-index: 1000;opacity:0.4;filter:alpha(opacity=40); display:none;}
-		#delete_button:hover {opacity:1;filter:alpha(opacity=100)}
-		#rating_stars{position: absolute; top: 1000px; left: 1000px; width:150px; margin-top: 10}		
-		
-		#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: ${-thumbnailImageDimensions - 23}px; left: ${thumbnailImageDimensions*5 + 160}px;}
-		.add_new_image{position: relative; top: ${-thumbnailImageDimensions + 10}px; left: ${thumbnailImageDimensions*5 + 160}px;}
-		
-		.after_main_image{text-align: left; margin: 30px 0; padding-top: 30px; clear:both;}
-		
-		/* parameters borrowed from jquery.jcarousel.skin.css */
-		.jcarousel-skin-tango .jcarousel-container-horizontal {
-    		width: ${thumbnailImageDimensions*5 + 75}px;
-    		height: ${thumbnailImageDimensions + 8}px;
-    	}
-    	.jcarousel-skin-tango .jcarousel-clip-horizontal {
-		    width:  ${thumbnailImageDimensions*5 + 75}px;
-		    height: ${thumbnailImageDimensions + 8}px;
+		@media (max-width: 750px) {
+		  	#aside {
+		    	float: none;
+		    	width: auto;
+		    	position: static;
+		  	}
 		}
-		.jcarousel-skin-tango .jcarousel-item {
-		    width: ${thumbnailImageDimensions}px;
-		    height: ${thumbnailImageDimensions}px;
+		#check-for-new-button, #add-new-image-button, #delete-button, #rating-stars {
+			float: right;
+			clear: both;
 		}
-		.jcarousel-skin-tango .jcarousel-next-horizontal {
-	    	top: ${thumbnailImageDimensions/2}px;
-	    }	
-		.jcarousel-skin-tango .jcarousel-prev-horizontal {
-    		top: ${thumbnailImageDimensions/2}px;
-    	}	    
+		#add-new-image-button, #delete-button {
+			margin-top: 8px;
+		}
+		#delete-button{
+			display:none;
+		}
+		#rating-stars {
+			padding-top: 20px;
+			width: 85px;
+			text-align: center;
+			margin-right: 20px;
+		}
+		#rating-stars-text {
+			margin-bottom: 10px;
+			margin-top:5px;
+		}
+		.caption{
+			color:#0087e5; 
+			font:italic 14px georgia,serif;
+		}
+		.description{ 
+			font-style:italic; 
+			font-size:11px;
+		}
+		.extra-controls {
+			padding-bottom: 100px;
+		}
+		#comment-textarea {
+			margin-right:10px; 
+			width:99%;
+		}
+		#comment-button {
+			margin-right: 2px;
+			float: right;
+			margin-top: 10px;
+		}
+		#comments-area {
+			margin-bottom: 50px;
+			padding-top: 50px;
+		}
+		table.forum {
+			border-bottom: none;
+			margin-bottom: 0;
+		}
+    	.fotorama__thumb {
+		    background-color: #000;
+		}
+		.fotorama__wrap {
+			margin: auto;
+		}
+		.fotorama__caption {
+			text-align: left;
+		}
+		.fotorama-container {
+			text-align: center;
+			padding-top: 10px;
+		}
     </style>
     
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>   
-	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/jquery.galleria.js'/>" ></script>
-	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/jquery.jcarousel.pack.js'/>"></script>
-	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/jquery.MetaData.js'/>"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
  	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/jquery.rating.1.1.js'/>"></script>
  	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
  	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/thickbox.js'/>"></script>	
- 	
+ 	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/fotorama.js'/>"></script>
 	<script type="text/javascript">
 	
-	$(document).ready(function(){ 
-		$('ul.gallery_demo').galleria({
-			history   : true, // activates the history object for bookmarking, back-button etc.
-			clickNext : ${fn:length(sessionMap.imageGalleryList) > 1}, // sets helper for making the image clickable only if there is more than 1 image
-			insert    : '#main_image', // the containing selector for our main image
-			onImage   : function(image,caption,thumb) {
+		$(document).ready(function(){ 
+			$('.fotorama')
+				.on('fotorama:show ',
+					function (e, fotorama, extra) {
+					    loadImageData(fotorama.activeFrame.id);
+					}
+				)
+				.fotorama({
+					//TODO history   : true,
+					width: ${mediumImageDimensions + 60},
+					height: Math.round(${mediumImageDimensions + 60}*9/16),
+					maxwidth: '100%',
+					//ratio: 16/9,
+					allowfullscreen: true,
+					keyboard: true,
+					nav: 'thumbs',
+					fit: 'scaledown',
+					//thumbfit: 'contain',
+					loop: true,
+					thumbwidth: 80,//${thumbnailImageDimensions},
+					thumbheight: 80,//${thumbnailImageDimensions},
+				    data: [
+						<c:forEach var="image" items="${sessionMap.imageGalleryList}" varStatus="status">
+							<c:if test="${!image.createByAuthor && (image.createBy != null)}">
+								<c:set var="imageAddedBy" ><div class="description"><fmt:message key="label.learning.added.by" /> <c:out value="${image.createBy.firstName} ${commentsImage.createBy.lastName}" escapeXml="true"/></div></c:set>
+							</c:if>					
+						
+							{
+								img: '<html:rewrite page="/download/?uuid="/>${image.mediumFileUuid}&preferDownload=false',
+								//thumb: '<html:rewrite page="/download/?uuid="/>${image.thumbnailFileUuid}&preferDownload=false',
+								full: '<html:rewrite page="/download/?uuid="/>${image.originalFileUuid}&preferDownload=false',
+								id: '${image.uid}', // Custom anchor is used with the hash:true option.
+								caption: '<div class="caption">${image.titleEscaped}</div>'
+									+ '<span class="description">${image.descriptionEscaped}</span>'
+									+'${imageAddedBy}',
+								//html: $('selector'), // ...or '<div>123</div>'. Custom HTML inside the frame.
+								//fit: 'cover' // Override the global fit option.
+								//any: 'Any data relative to the frame you want to store'
+							},
+						</c:forEach>
+					]
+				}
+			);
+	
+			$('#votingForm_vote').click(function() {
 				
-				//do further calculations only after picture is loaded so we know its width and height
-				image.load(function (){
-					// fetch the thumbnail container
-					var _li = thumb.parents('li');
-					// fade out inactive thumbnail
-					_li.siblings().children('img.selected').fadeTo(500,0.3);
-					// fade in active thumbnail
-					thumb.fadeTo('fast',1).addClass('selected');
-					// add a title for the clickable image
-					image.attr('title','Next image >>');
-
-					//positioning image title, description and rating
-					caption.css('left',image.width() + 20);
-					$('#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());
-					
-					$("#delete_button").hide();
-					$("#delete_button").css('left', image.width() - 30);
-							
-					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};
-				    $('#main_image').css('height', newHeight + 40);
-
-				    loadImageData(thumb.attr('id'));
+				$('#votingForm').ajaxSubmit( {
+					success: afterRatingSubmit  // post-submit callback
 				});
-
-			},
-			onThumb : function(thumb) { // thumbnail effects goes here
-				// fetch the thumbnail container
-				var _li = thumb.parents('li');
-				// if thumbnail is active, fade all the way.
-				var _fadeTo = _li.is('.active') ? '1' : '0.3';
-				// fade in the thumbnail when finnished loading
-				thumb.css({display:'none',opacity:_fadeTo}).fadeIn(1500);
-				// hover effects
-				thumb.hover(
-					function() { thumb.fadeTo('fast',1); },
-					function() { _li.not('.active').children('img').fadeTo('fast',0.3); } // don't fade out if the parent is active
-				)
-			}
+				return false;
+			});
+	
 		});
-		
-		$('#mycarousel').jcarousel({
-			'itemFallbackDimension': 100
-		});
 
-		$('#votingForm_vote').click(function() {
-	    	var options = { 
-	    		success: afterRatingSubmit  // post-submit callback
-	        }; 				
-		    				
-			$('#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";
-		//}
-
-	});
-
-	<!--
 		function checkNew(){
 			document.location.href = "<c:url value="/learning/start.do"/>?mode=${mode}&toolSessionID=${toolSessionID}";
  		    return false;
@@ -204,7 +191,7 @@
 		}
 
 		//The panel of imageGallery list panel
-		var commentsAreaTargetDiv = "#commentsArea";
+		var commentsAreaTargetDiv = "#comments-area";
 		function loadImageData(imageUid){
 			var url = "<c:url value="/learning/loadImageData.do"/>";
 			$(commentsAreaTargetDiv).load(
@@ -218,24 +205,11 @@
 		}
 
 		function afterImageDataLoaded() {
-			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();
-			href = href + "&dbWidth=" + $('#commentsArea_originalImageWidth').val();
-			href = href + "&dbHeight=" + $('#commentsArea_originalImageHeight').val();
-			$("#openOriginalSizeLink a").attr('href', href);
-			
 			var imageUid = $('#commentsArea_imageUid').val();
 			if (${imageGallery.allowRank && (mode != 'teacher')}) {
-				//adjust #rating_stars top position to description height 
-				if ($('#main_image img').height() < $('span.caption').height() + $("#description").height() + 60) {
-					$("#rating_stars").css('top', $('span.caption').height() + $("#description").height() + 20);	
-				}
 
 				var numberRatings = $('#commentsArea_numberRatings').val();
 				$('#numberRatings').html(numberRatings);
@@ -277,17 +251,15 @@
 			}
 			
 			//set visibility of "Delete image" button 
-			var isAuthor = $('#commentsArea_isAuthor').val();
-			if (isAuthor == "true") {
-				$("#delete_button").show();
-			}
+			var isAuthor = $('#commentsArea_isAuthor').val()  == "true";
+			$("#delete-button").toggle(isAuthor);
 			
 		}
 		function setStarRatingChecked(currentRating){
-			$('#rating_stars_inputs').empty();
+			$('#rating-stars-inputs').empty();
 			for (var i = 1; i <= 5; i = i + 1) {
 				var checked = (currentRating == i) ? "checked = 'checked' " : "";
-				$('#rating_stars_inputs').append('<input class="star" type="radio" name="rating" value="' + i + '"' + checked + '/>');
+				$('#rating-stars-inputs').append('<input class="star" type="radio" name="rating" value="' + i + '"' + checked + '/>');
 			}
 			$('input[type=radio].star').rating({
 				readOnly: ${finishedLock},
@@ -306,13 +278,12 @@
 		function afterRatingSubmit(responseText, statusText)  { 
 			var imageUid = $('#commentsArea_imageUid').val();
 			loadImageData(imageUid);
-		} 
-	-->        
+		}     
     </script>
    
 </lams:head>
 <body class="stripes">
-	<div id="content" style="min-width: ${windowMinimumWidth}px;">
+	<div id="content">
 
 		<%--ImageGallery information-----------------------------------%>
 
@@ -322,126 +293,96 @@
 		<p>
 			<c:out value="${imageGallery.instructions}" escapeXml="false"/>
 		</p>
+		
 		<c:if test="${sessionMap.lockOnFinish and mode != 'teacher'}">
-				<div class="info">
-					<c:choose>
-						<c:when test="${sessionMap.userFinished}">
-							<fmt:message key="message.activityLocked" />
-						</c:when>
-						<c:otherwise>
-							<fmt:message key="message.warnLockOnFinish" />
-						</c:otherwise>
-					</c:choose>
-				</div>
+			<div class="info">
+				<c:choose>
+					<c:when test="${sessionMap.userFinished}">
+						<fmt:message key="message.activityLocked" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="message.warnLockOnFinish" />
+					</c:otherwise>
+				</c:choose>
+			</div>
 		</c:if>
+		
 		<%@ include file="/common/messages.jsp"%>
 		
 		<%--Main image---------------------------------------------------%>
 		
-		<div class="galleria_container">
-			<div id="description"></div>
-					
-			<div id="main_image"></div>
-			
-			<div id="openOriginalSizeLink">
-				<a href="" title="Enlarge" class="thickbox" >
-					<fmt:message key="label.learning.open.original.size" />
-				</a>
-			</div>
-			
-			<%--Delete button---------------------------------------%>
-
-			<div id="delete_button">
-				<img src="<lams:WebAppURL />includes/images/delete.png"
-					title="<fmt:message key="label.learning.delete.image" />"
-					onclick="return deleteImage();" />
-			</div>
-			
-			<%--Ranking/Voting area---------------------------------------%>
-
-			<c:if test="${(mode != 'teacher') && (not empty sessionMap.imageGalleryList)}">				
-				<div id="rating_stars">
-					<c:if test="${imageGallery.allowRank}">
-						<html:form action="learning/saveOrUpdateRating" method="post" styleId="ratingForm">
-							<input type="hidden" name="sessionMapID" value="${sessionMapID}"/>
-							<input type="hidden" name="imageUid" id="ratingForm_imageUid"/>
-							
-							<div id="rating_stars_inputs"> 
-								<input class="star" type="radio" name="rating" value="1" />
-								<input class="star" type="radio" name="rating" value="2" />
-								<input class="star" type="radio" name="rating" value="3" />
-								<input class="star" type="radio" name="rating" value="4" />
-								<input class="star" type="radio" name="rating" value="5" />						
-							</div>
-							
-							<br>
-							<p>
-								<span id="numberRatings"></span>
-								<fmt:message key="label.learning.ratings" />
-							</p>						
-						</html:form>							
-					</c:if>
-					
-					<c:if test="${imageGallery.allowVote && (mode != 'teacher')}">
-						<html:form action="learning/vote" method="post" styleId="votingForm">
-							<input type="hidden" name="sessionMapID" value="${sessionMapID}"/>
-							<input type="hidden" name="imageUid" id="votingForm_imageUid"/>
-							
-							<p class="small-space-top">
-								<html:checkbox property="vote" styleClass="noBorder" styleId="votingForm_vote" >	</html:checkbox>
+		<div class="fotorama-container">
+			<div class="fotorama"></div>
+		</div>
+		
+		<c:if test="${(mode != 'teacher') && (imageGallery.allowRank || imageGallery.allowVote || imageGallery.allowShareImages)}">	
+			<div class="extra-controls">
+				
+				<%--Ranking/Voting area---------------------------------------%>
 	
-								<label for="votingForm_vote" id="votingForm_label"></label>
-							</p>
-							
-						</html:form>							
-					</c:if> 			
-				</div>
-			</c:if>		
-			
-			<%--Image scroller-------------------------------------------------%>			
-			
-			<ul class="gallery_demo jcarousel-skin-tango" id="mycarousel">
-				<c:forEach var="image" items="${sessionMap.imageGalleryList}" varStatus="status">
-					<c:choose>
-						<c:when test="${status.index == 0}">
-							<li class="active">
-						</c:when>
-						<c:otherwise>
-							<li>
-						</c:otherwise>
-					</c:choose>
-					<c:set var="title">
-						<c:out value="${image.title}" escapeXml="true"/>	
-				        </c:set>
-						<a href="<html:rewrite page='/download/?uuid='/>${image.mediumFileUuid}&preferDownload=false" title="${title}" id="${image.uid}" width="${image.mediumImageWidth}" height="${image.mediumImageHeight}">
-							<img src="<html:rewrite page='/download/?uuid='/>${image.thumbnailFileUuid}&preferDownload=false" alt="${title}" id="${image.uid}">
+				<c:if test="${not empty sessionMap.imageGalleryList}">				
+					<div id="rating-stars">
+						<c:if test="${imageGallery.allowRank}">
+							<html:form action="learning/saveOrUpdateRating" method="post" styleId="ratingForm">
+								<input type="hidden" name="sessionMapID" value="${sessionMapID}"/>
+								<input type="hidden" name="imageUid" id="ratingForm_imageUid"/>
+								
+								<div id="rating-stars-inputs"> 
+									<input class="star" type="radio" name="rating" value="1" />
+									<input class="star" type="radio" name="rating" value="2" />
+									<input class="star" type="radio" name="rating" value="3" />
+									<input class="star" type="radio" name="rating" value="4" />
+									<input class="star" type="radio" name="rating" value="5" />						
+								</div>
+								
+								<br>
+								<div id="rating-stars-text">
+									<span id="numberRatings"></span>
+									<fmt:message key="label.learning.ratings" />
+								</div>
+							</html:form>
+						</c:if>
+						
+						<c:if test="${imageGallery.allowVote}">
+							<html:form action="learning/vote" method="post" styleId="votingForm">
+								<input type="hidden" name="sessionMapID" value="${sessionMapID}"/>
+								<input type="hidden" name="imageUid" id="votingForm_imageUid"/>
+								
+								<p class="small-space-top" style="margin-right: 0px">
+									<html:checkbox property="vote" styleClass="noBorder" styleId="votingForm_vote" />
+									<label for="votingForm_vote" id="votingForm_label"></label>
+								</p>
+								
+							</html:form>							
+						</c:if> 			
+					</div>
+				</c:if>
+				
+				<%--"Check for new", "Add new image" and "Delete" buttons---------------%>
+				
+				<c:if test="${imageGallery.allowShareImages}">
+					<a href="#nogo" onclick="return checkNew()" class="button" id="check-for-new-button"> 
+						<fmt:message key="label.check.for.new" /> 
+					</a>
+						
+					<c:if test="${not finishedLock}">
+						<a href="<html:rewrite page='/learning/newImageInit.do?sessionMapID='/>${sessionMapID}&KeepThis=true&TB_iframe=true&height=540&width=480&modal=true" class="button thickbox" id="add-new-image-button">  
+							<fmt:message key="label.learning.add.new.image" />
 						</a>
-					</li>
-				</c:forEach>
-			</ul>
+					</c:if>
+						
+					<a href="#nogo" onclick="return deleteImage();" class="button" id="delete-button"> 
+						<fmt:message key="label.learning.delete.image" /> 
+					</a>
+				</c:if>
+			</div>
+		</c:if>
 			
-			<%--"Check for new" and "Add new image" buttons---------------%>
-			
-			<c:if test="${imageGallery.allowShareImages && (mode != 'teacher')}">
-				<a href="#nogo" onclick="return checkNew()" class="button check_for_new"> 
-					<fmt:message key="label.check.for.new" /> 
-				</a>
-			</c:if>
-			<c:if test="${imageGallery.allowShareImages && (mode != 'teacher') && (not finishedLock)}">
-				<br>
-				<a href="<html:rewrite page='/learning/newImageInit.do?sessionMapID='/>${sessionMapID}&KeepThis=true&TB_iframe=true&height=540&width=480&modal=true" class="button add_new_image thickbox">  
-					<fmt:message key="label.learning.add.new.image" />
-				</a>
-			</c:if>		
-			
-		</div>
-		<div class="after_main_image"></div>
-		
 		<%--Comments area----------------------------------------------%>	
- 		
-		<div id="commentsArea">
+	 		
+		<div id="comments-area">
 			<%@ include file="/pages/learning/parts/commentsarea.jsp"%> 
-		</div>
+		</div>	
  
 		<%--Reflection--------------------------------------------------%>
 
@@ -501,11 +442,7 @@
 					</c:otherwise>
 				</c:choose>
 			</div>
-		</c:if>
-		
-		<div id="openOriginalSizeLink_size" style="display:none;" >
-			<fmt:message key="label.learning.open.original.size" />
-		</div>		
+		</c:if>	
 
 	</div>
 	<%--closes content--%>
Index: lams_tool_images/web/pages/learning/notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/learning/notebook.jsp,v
diff -u -r1.6 -r1.6.2.1
--- lams_tool_images/web/pages/learning/notebook.jsp	27 Mar 2014 20:10:14 -0000	1.6
+++ lams_tool_images/web/pages/learning/notebook.jsp	30 Oct 2014 18:22:02 -0000	1.6.2.1
@@ -1,7 +1,6 @@
-<%@ include file="/common/taglibs.jsp"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 
+<%@ include file="/common/taglibs.jsp"%>
 <lams:html>
 <lams:head>
 	<title><fmt:message key="label.learning.title" />
@@ -12,10 +11,10 @@
 		function disableFinishButton() {
 			document.getElementById("finishButton").disabled = true;
 		}
-	         function submitForm(methodName){
-        	        var f = document.getElementById('messageForm');
-	                f.submit();
-	        }
+		function submitForm(methodName){
+			var f = document.getElementById('messageForm');
+			f.submit();
+		}
 	</script>
 </lams:head>
 <body class="stripes">
@@ -38,8 +37,7 @@
 				<lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true" />
 			</p>
 
-			<html:textarea cols="60" rows="8" property="entryText"
-				styleClass="text-area" />
+			<html:textarea cols="60" rows="8" property="entryText"	styleClass="text-area" />
 
 			<div class="space-bottom-top align-right">
 				<html:link href="#nogo" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
Index: lams_tool_images/web/pages/learning/success.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/learning/success.jsp,v
diff -u -r1.1 -r1.1.12.1
--- lams_tool_images/web/pages/learning/success.jsp	11 Oct 2008 12:04:14 -0000	1.1
+++ lams_tool_images/web/pages/learning/success.jsp	30 Oct 2014 18:22:02 -0000	1.1.12.1
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
-		"http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 
 <%@ include file="/common/taglibs.jsp"%>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -11,7 +10,7 @@
 	<body class="stripes">
 		<script type="text/javascript">
 			var reqIDVar = new Date();
-			window.parent.location.href  = "${tool}/pages/learning/learning.jsp?sessionMapID=${sessionMapID}&mode=${mode}&reqID="+reqIDVar.getTime();
+			window.parent.location.href = "${tool}/pages/learning/learning.jsp?sessionMapID=${sessionMapID}&mode=${mode}&reqID="+reqIDVar.getTime();
 		</script>
 		<div style="align:center">
 			Add File success, <a href="<c:url value='/learning/addfile.do'/>?sessionMapID=${sessionMapID}&mode=${mode}" target="newImageGalleryFrame">click here to return</a>.
Index: lams_tool_images/web/pages/learning/parts/addimage.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/learning/parts/addimage.jsp,v
diff -u -r1.3 -r1.3.2.1
--- lams_tool_images/web/pages/learning/parts/addimage.jsp	24 Dec 2013 23:56:37 -0000	1.3
+++ lams_tool_images/web/pages/learning/parts/addimage.jsp	30 Oct 2014 18:22:01 -0000	1.3.2.1
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
-		"http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 		
 <%@ include file="/common/taglibs.jsp"%>
 
@@ -8,7 +7,7 @@
 		<title>
 			<fmt:message key="label.learning.title" />
 		</title>
-		<%@ include file="/common/headerWithoutPrototype.jsp"%>
+		<%@ include file="/common/header.jsp"%>
 	</lams:head>
 	
 	<body class="stripes">
Index: lams_tool_images/web/pages/learning/parts/addmultipleimages.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/learning/parts/addmultipleimages.jsp,v
diff -u -r1.1 -r1.1.10.1
--- lams_tool_images/web/pages/learning/parts/addmultipleimages.jsp	25 Dec 2008 14:28:02 -0000	1.1
+++ lams_tool_images/web/pages/learning/parts/addmultipleimages.jsp	30 Oct 2014 18:22:01 -0000	1.1.10.1
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
-		"http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 		
 <%@ include file="/common/taglibs.jsp"%>
 
@@ -8,7 +7,7 @@
 		<title>
 			<fmt:message key="label.learning.title" />
 		</title>
-		<%@ include file="/common/headerWithoutPrototype.jsp"%>
+		<%@ include file="/common/header.jsp"%>
 	</lams:head>
 	
 	<body class="stripes">
Fisheye: Tag 1.4.2.1 refers to a dead (removed) revision in file `lams_tool_images/web/pages/learning/parts/commentlist.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
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.12 -r1.12.2.1
--- lams_tool_images/web/pages/learning/parts/commentsarea.jsp	5 Jun 2014 08:41:30 -0000	1.12
+++ lams_tool_images/web/pages/learning/parts/commentsarea.jsp	30 Oct 2014 18:22:01 -0000	1.12.2.1
@@ -6,52 +6,69 @@
 <c:set var="commentsImageGallery" value="${commentsSessionMap.imageGallery}" />
 <c:set var="commentsImage" value="${commentsSessionMap.currentImage}" />
 <c:set var="commentsFinishedLock" value="${commentsSessionMap.finishedLock}" />
-<c:if test="${!commentsImage.createByAuthor && (commentsImage.createBy != null)}">
-	<c:set var="commentsAddedBy" >
-		<fmt:message key="label.learning.added.by" /> 
-		<br>
-			<c:out value="${commentsImage.createBy.firstName} ${commentsImage.createBy.lastName}" escapeXml="true"/>
-		<br>
-	</c:set>
-</c:if>
 
 <input type="hidden" name="imageUid" id="commentsArea_imageUid" value="${commentsImage.uid}"/>
 <input type="hidden" name="title" id="commentsArea_title" value="<c:out value='${commentsImage.title}' />"/>
 <input type="hidden" name="originalImageWidth" id="commentsArea_originalImageWidth" value="${commentsImage.originalImageWidth}"/>
 <input type="hidden" name="originalImageHeight" id="commentsArea_originalImageHeight" value="${commentsImage.originalImageHeight}"/>
 <input type="hidden" name="originalFileUuid" id="commentsArea_originalFileUuid" value="${commentsImage.originalFileUuid}"/>
-<input type="hidden" name="imageDescription" id="commentsArea_description" value="<c:out value='${commentsImage.description}' />"/>
 <input type="hidden" name="averageRating" id="commentsArea_averageRating" value="${commentsSessionMap.averageRating}"/>
 <input type="hidden" name="numberRatings" id="commentsArea_numberRatings" value="${commentsSessionMap.numberRatings}"/>
 <input type="hidden" name="currentRating" id="commentsArea_currentRating" value="${commentsSessionMap.currentRating}"/>
 <input type="hidden" name="isVoted" id="commentsArea_isVoted" value="${commentsSessionMap.isVoted}"/>
 <input type="hidden" name="isAuthor" id="commentsArea_isAuthor" value="${commentsSessionMap.isAuthor}"/>
-<input type="hidden" name="addedBy" id="commentsArea_addedBy" value="${commentsAddedBy}"/>
 
-
 <c:if test="${commentsImageGallery.allowCommentImages && (not empty commentsSessionMap.imageGalleryList)}">
 
 	<%@ include file="/common/messages.jsp"%>
 
-	<%@ include file="commentlist.jsp"%>
-
-	<c:if test="${commentsMode != 'teacher' && (not commentsFinishedLock)}">
-		<div class="field-name">
-			<fmt:message key="label.learning.add.comment" />
+			<div class="field-name">
+				<fmt:message key="label.learning.comments" />
+			</div>
+	
+	<c:forEach var="comment" items="${commentsSessionMap.comments}">
+	
+		<div>
+			<table cellspacing="0" class="forum">
+				<tr >
+					<th >
+						<fmt:message key="label.learning.by" />
+						<c:set var="author" value="${comment.createBy.firstName} ${comment.createBy.lastName}" />
+						<c:if test="${empty author}">
+							<c:set var="author">
+								<fmt:message key="label.default.user.name" />
+							</c:set>
+						</c:if>
+						<c:out value="${author}" escapeXml="true" /> - <lams:Date value="${comment.createDate}" />
+					</th>
+				</tr>
+					
+				<tr>
+					<td class="posted-by">
+					</td>
+				</tr>
+		
+				<tr>
+					<td>
+						<c:out value="${comment.comment}" escapeXml="false" />
+					</td>
+				</tr>
+					
+			</table>
 		</div>
+			
+	</c:forEach>
 
+	<c:if test="${commentsMode != 'teacher' && (not commentsFinishedLock)}">
 		<div >
 			<html:form action="learning/addNewComment" method="post">
-				<lams:STRUTS-textarea property="comment" rows="3" cols="75" styleId="comment_textarea" style="margin-right:10px;"/>		
+				<lams:STRUTS-textarea property="comment" rows="3" styleId="comment-textarea"/>		
 		
-				<html:button property="commentButton" onclick="javascript:addNewComment(${commentsSessionMap.currentImage.uid}, document.getElementById('comment__lamshidden').value);" styleClass="button" style="vertical-align:bottom;">
-					<fmt:message key="label.learning.post" />
+				<html:button property="commentButton" onclick="javascript:addNewComment(${commentsSessionMap.currentImage.uid}, document.getElementById('comment__lamshidden').value);" styleClass="button" styleId="comment-button">
+					<fmt:message key="label.learning.add.comment" />
 				</html:button>
 			</html:form>					
 		</div>
-		<br>
 	</c:if>
 				
 </c:if>
-
-
Fisheye: Tag 1.1.12.1 refers to a dead (removed) revision in file `lams_tool_images/web/pages/learning/parts/starratingarea.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_images/web/pages/monitoring/imagesummary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/monitoring/imagesummary.jsp,v
diff -u -r1.9 -r1.9.2.1
--- lams_tool_images/web/pages/monitoring/imagesummary.jsp	5 Jun 2014 08:41:30 -0000	1.9
+++ lams_tool_images/web/pages/monitoring/imagesummary.jsp	30 Oct 2014 18:22:01 -0000	1.9.2.1
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 
 <%@ include file="/common/taglibs.jsp"%>
 <lams:html>
@@ -15,7 +14,6 @@
 		<%@ include file="/common/header.jsp"%>
 		
 		<script type="text/javascript">
-
 			function deleteComment(commentUid) {
 				var	deletionConfirmed = confirm("<fmt:message key="warning.msg.monitoring.do.you.want.to.delete"></fmt:message>");
 
@@ -170,10 +168,12 @@
 			<br>
 			
 			<lams:ImgButtonWrapper>
-				<a href="#" onclick="self.parent.tb_remove();" class="button right-buttons space-left"><fmt:message
-						key="label.cancel" /> </a>
-				<a href="#" onclick="document.imageGalleryItemForm.submit();" class="button right-buttons space-left"><fmt:message
-						key="label.monitoring.imagesummary.save" /> </a>
+				<a href="#" onclick="self.parent.tb_remove();" class="button right-buttons space-left">
+					<fmt:message key="label.cancel" /> 
+				</a>
+				<a href="#" onclick="document.imageGalleryItemForm.submit();" class="button right-buttons space-left">
+					<fmt:message key="label.monitoring.imagesummary.save" /> 
+				</a>
 			</lams:ImgButtonWrapper>
 		</div>
 		<!--closes content-->
Index: lams_tool_images/web/pages/monitoring/monitoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/monitoring/monitoring.jsp,v
diff -u -r1.9 -r1.9.2.1
--- lams_tool_images/web/pages/monitoring/monitoring.jsp	24 Apr 2014 20:39:10 -0000	1.9
+++ lams_tool_images/web/pages/monitoring/monitoring.jsp	30 Oct 2014 18:22:01 -0000	1.9.2.1
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 
 <%@ include file="/common/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.tool.imageGallery.ImageGalleryConstants"%>
Index: lams_tool_images/web/pages/monitoring/notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/monitoring/notebook.jsp,v
diff -u -r1.2 -r1.2.2.1
--- lams_tool_images/web/pages/monitoring/notebook.jsp	27 Mar 2014 20:10:14 -0000	1.2
+++ lams_tool_images/web/pages/monitoring/notebook.jsp	30 Oct 2014 18:22:01 -0000	1.2.2.1
@@ -1,48 +1,47 @@
-<%@ include file="/common/taglibs.jsp"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 
+<%@ include file="/common/taglibs.jsp"%>
 <lams:html>
 <lams:head>
 	<title><fmt:message key="label.learning.title" /></title>
 	<%@ include file="/common/header.jsp"%>
 </lams:head>
 <body class="stripes">
 		
-			<div id="content">
-				<h1>
-					<fmt:message key="page.title.monitoring.view.reflection"/>
-				</h1>
-				<c:out value="${userDTO.fullName}" escapeXml="true"/><BR><BR>
-				<table class="alternative-color" cellspacing="0">
-					<tr>
-						<th class="first">
-							<lams:out value="${userDTO.reflectInstrctions}" escapeHtml="true"/>
-						</th>
-					</tr>
-					<tr>
-						<td>
-							<c:choose>
-								<c:when test="${userDTO.finishReflection}">
-									<lams:out value="${userDTO.reflect}" escapeHtml="true"/>
-								</c:when>
-								<c:otherwise>
-									<fmt:message key="message.no.reflection.available" />
-								</c:otherwise>
-							</c:choose>
-						</td>
-					</tr>
-				</table>
-				<table cellpadding="0">
-					<tr>
-						<td>
-							<a href="javascript:window.close();" class="button"><fmt:message key="button.close"/></a>
-						</td>
-					</tr>
-				</table>
-			</div>
-		<div id="footer">
-		</div>
-		<!--closes footer-->
+	<div id="content">
+		<h1>
+			<fmt:message key="page.title.monitoring.view.reflection"/>
+		</h1>
+		
+		<c:out value="${userDTO.fullName}" escapeXml="true"/><BR><BR>
+		<table class="alternative-color" cellspacing="0">
+			<tr>
+				<th class="first">
+					<lams:out value="${userDTO.reflectInstrctions}" escapeHtml="true"/>
+				</th>
+			</tr>
+			<tr>
+				<td>
+					<c:choose>
+						<c:when test="${userDTO.finishReflection}">
+							<lams:out value="${userDTO.reflect}" escapeHtml="true"/>
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="message.no.reflection.available" />
+						</c:otherwise>
+					</c:choose>
+				</td>
+			</tr>
+		</table>
+		<table cellpadding="0">
+			<tr>
+				<td>
+					<a href="javascript:window.close();" class="button"><fmt:message key="button.close"/></a>
+				</td>
+			</tr>
+		</table>
+	</div>
+			
+	<div id="footer"></div><!--closes footer-->
 </body>
 </lams:html>
Index: lams_tool_images/web/pages/monitoring/start.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/monitoring/start.jsp,v
diff -u -r1.3 -r1.3.10.1
--- lams_tool_images/web/pages/monitoring/start.jsp	11 Dec 2008 12:37:40 -0000	1.3
+++ lams_tool_images/web/pages/monitoring/start.jsp	30 Oct 2014 18:22:01 -0000	1.3.10.1
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
-		"http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 
 <%@ include file="/common/taglibs.jsp"%>
 
Index: lams_tool_images/web/pages/monitoring/startimagesummary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/monitoring/Attic/startimagesummary.jsp,v
diff -u -r1.1 -r1.1.10.1
--- lams_tool_images/web/pages/monitoring/startimagesummary.jsp	2 Dec 2008 17:17:17 -0000	1.1
+++ lams_tool_images/web/pages/monitoring/startimagesummary.jsp	30 Oct 2014 18:22:01 -0000	1.1.10.1
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
-		"http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 
 <%@ include file="/common/taglibs.jsp"%>
 
Index: lams_tool_images/web/pages/monitoring/userlist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/monitoring/userlist.jsp,v
diff -u -r1.3 -r1.3.2.1
--- lams_tool_images/web/pages/monitoring/userlist.jsp	31 Mar 2014 20:50:12 -0000	1.3
+++ lams_tool_images/web/pages/monitoring/userlist.jsp	30 Oct 2014 18:22:01 -0000	1.3.2.1
@@ -1,48 +1,47 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 
-
 <%@ include file="/common/taglibs.jsp"%>
 <lams:html>
 <lams:head>
 	    <%@ include file="/common/header.jsp" %>
 </lams:head>
 <body class="stripes">
 
-
-		<div id="content">
+	<div id="content">
 		
 		<h1>
 			<fmt:message key="label.monitoring.heading.access"/>
 		</h1>
 		
-	<table border="0" cellspacing="3" width="98%">
-		<tr>
-			<th>
-				<fmt:message key="monitoring.label.access.time" />
-			</th>
-			<th>
-				<fmt:message key="monitoring.label.user.name" />
-			</th>
-		</tr>
-		<c:forEach var="user" items="${userList}">
+		<table border="0" cellspacing="3" width="98%">
 			<tr>
-				<td>
-					<lams:Date value="${user.accessDate}"/>
+				<th>
+					<fmt:message key="monitoring.label.access.time" />
+				</th>
+				<th>
+					<fmt:message key="monitoring.label.user.name" />
+				</th>
+			</tr>
+			
+			<c:forEach var="user" items="${userList}">
+				<tr>
+					<td>
+						<lams:Date value="${user.accessDate}"/>
+					</td>
+					<td>
+						<c:out value="${user.firstName},${user.lastName}" escapeXml="true"/>
+					</td>
+				</tr>
+			</c:forEach>
+			
+			<tr>
+				<td colspan="3" class="align-right">
+					<a href="javaqscript:;" onclick="window.close()" class="button">Close</a>
 				</td>
-				<td>
-					<c:out value="${user.firstName},${user.lastName}" escapeXml="true"/>
-				</td>
 			</tr>
-		</c:forEach>
-		<tr>
-			<td colspan="3" class="align-right">
-				<a href="javaqscript:;" onclick="window.close()" class="button">Close</a>
-			</td>
-		</tr>
-	</table>
-</div>
-		<div id="footer"></div>
-		</div>
+		</table>
+	</div>
+
+	<div id="footer"></div>
 </body>
 </lams:html>
Index: lams_tool_images/web/pages/monitoring/parts/addimage.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/monitoring/parts/addimage.jsp,v
diff -u -r1.2 -r1.2.10.1
--- lams_tool_images/web/pages/monitoring/parts/addimage.jsp	25 Dec 2008 14:28:02 -0000	1.2
+++ lams_tool_images/web/pages/monitoring/parts/addimage.jsp	30 Oct 2014 18:22:01 -0000	1.2.10.1
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
-		"http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 		
 <%@ include file="/common/taglibs.jsp"%>
 
@@ -8,7 +7,7 @@
 		<title>
 			<fmt:message key="label.learning.title" />
 		</title>
-		<%@ include file="/common/headerWithoutPrototype.jsp"%>
+		<%@ include file="/common/header.jsp"%>
 	</lams:head>
 	
 	<body class="stripes">
Index: lams_tool_images/web/pages/monitoring/parts/addmultipleimages.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/monitoring/parts/addmultipleimages.jsp,v
diff -u -r1.1 -r1.1.10.1
--- lams_tool_images/web/pages/monitoring/parts/addmultipleimages.jsp	25 Dec 2008 14:28:02 -0000	1.1
+++ lams_tool_images/web/pages/monitoring/parts/addmultipleimages.jsp	30 Oct 2014 18:22:01 -0000	1.1.10.1
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
-		"http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 		
 <%@ include file="/common/taglibs.jsp"%>
 
@@ -8,7 +7,7 @@
 		<title>
 			<fmt:message key="label.learning.title" />
 		</title>
-		<%@ include file="/common/headerWithoutPrototype.jsp"%>
+		<%@ include file="/common/header.jsp"%>
 	</lams:head>
 	
 	<body class="stripes">
Index: lams_tool_images/web/pages/monitoring/parts/editcomment.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/monitoring/parts/Attic/editcomment.jsp,v
diff -u -r1.2 -r1.2.10.1
--- lams_tool_images/web/pages/monitoring/parts/editcomment.jsp	2 Dec 2008 17:17:18 -0000	1.2
+++ lams_tool_images/web/pages/monitoring/parts/editcomment.jsp	30 Oct 2014 18:22:01 -0000	1.2.10.1
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
-		"http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 		
 <%@ include file="/common/taglibs.jsp"%>
 
@@ -9,7 +8,7 @@
 			<fmt:message key="label.monitoring.title" />
 		</title>
 		
-		<%@ include file="/common/headerWithoutPrototype.jsp"%>
+		<%@ include file="/common/header.jsp"%>
 	</lams:head>
 	
 	<body class="stripes">