Index: lams_tool_images/.externalToolBuilders/SASS_lams_tool_images.launch
===================================================================
diff -u -ra83b0eec89979dce7415b02afdda324b14018dbb -rb294a4ad71917a3740ef2250a5929d6de43866cf
--- lams_tool_images/.externalToolBuilders/SASS_lams_tool_images.launch	(.../SASS_lams_tool_images.launch)	(revision a83b0eec89979dce7415b02afdda324b14018dbb)
+++ lams_tool_images/.externalToolBuilders/SASS_lams_tool_images.launch	(.../SASS_lams_tool_images.launch)	(revision b294a4ad71917a3740ef2250a5929d6de43866cf)
@@ -1,16 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_AUTO_TARGETS" value="sass.compile.auto,"/>
-<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_CLEAN_TARGETS" value="_sass.build.clean,"/>
-<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${project}"/>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="lams_tool_images"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/lams_tool_images/web/includes/css&quot; type=&quot;2&quot;/&gt;&#10;&lt;/resources&gt;}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${build_project:/build.xml}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,clean"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+    <stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_AUTO_TARGETS" value="sass.compile.auto,"/>
+    <stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_CLEAN_TARGETS" value="_sass.build.clean,"/>
+    <booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
+    <booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+    <stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${project}"/>
+    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+        <listEntry value="/lams_tool_images"/>
+    </listAttribute>
+    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+        <listEntry value="4"/>
+    </listAttribute>
+    <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
+    <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="lams_tool_images"/>
+    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/lams_tool_images/web/includes/css&quot; type=&quot;2&quot;/&gt;&#10;&lt;/resources&gt;}"/>
+    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${build_project:/build.xml}"/>
+    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,clean"/>
+    <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
 </launchConfiguration>
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/AuthoringController.java
===================================================================
diff -u -r17eedca34ff3aaaee38fc4dc4a93301351379c60 -rb294a4ad71917a3740ef2250a5929d6de43866cf
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 17eedca34ff3aaaee38fc4dc4a93301351379c60)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision b294a4ad71917a3740ef2250a5929d6de43866cf)
@@ -172,6 +172,23 @@
 	return "pages/authoring/start";
     }
 
+    @RequestMapping("/definelater")
+    public String defineLater(@ModelAttribute ImageGalleryForm imageGalleryForm, HttpServletRequest request) {
+
+	Long contentId = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID));
+	ImageGallery imageGallery = igService.getImageGalleryByContentId(contentId);
+
+	imageGallery.setDefineLater(true);
+	igService.saveOrUpdateImageGallery(imageGallery);
+
+	//audit log the teacher has started editing activity in monitor
+	igService.auditLogStartEditingActivityInMonitor(contentId);
+
+	request.setAttribute(AttributeNames.ATTR_MODE, ToolAccessMode.TEACHER.toString());
+	request.setAttribute("startForm", imageGalleryForm);
+	return "pages/authoring/start";
+    }
+
     /**
      * Display same entire authoring page content from HttpSession variable.
      */
@@ -200,8 +217,8 @@
      * This method will persist all inforamtion in this authoring page, include all imageGallery item, information etc.
      */
     @RequestMapping(path = "/update", method = RequestMethod.POST)
-    public String updateContent(@ModelAttribute ImageGalleryForm imageGalleryForm,
-	    HttpServletRequest request) throws IllegalAccessException, InvocationTargetException, Exception {
+    public String updateContent(@ModelAttribute ImageGalleryForm imageGalleryForm, HttpServletRequest request)
+	    throws IllegalAccessException, InvocationTargetException, Exception {
 
 	// get back sessionMAP
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
@@ -358,7 +375,7 @@
      * temporarily remove from page, all permenant change will happen only when user sumbit this imageGallery item
      * again.
      */
-    @RequestMapping("/removeImage")
+    @RequestMapping("/removeImageFile")
     public String removeImageFile(HttpServletRequest request) {
 
 	request.setAttribute("itemAttachment", null);
@@ -372,8 +389,8 @@
      * persisted.
      */
     @RequestMapping("/saveOrUpdateImage")
-    public String saveOrUpdateImage(@ModelAttribute ImageGalleryItemForm imageGalleryItemForm, HttpServletRequest request,
-	    HttpServletResponse response) {
+    public String saveOrUpdateImage(@ModelAttribute ImageGalleryItemForm imageGalleryItemForm,
+	    HttpServletRequest request, HttpServletResponse response) {
 
 	MultiValueMap<String, String> errorMap = ImageGalleryUtils.validateImageGalleryItem(imageGalleryItemForm, true);
 
@@ -495,7 +512,7 @@
      * Remove imageGallery item from HttpSession list and update page display. As authoring rule, all persist only
      * happen when user submit whole page. So this remove is just impact HttpSession values.
      */
-    @RequestMapping("/removeImageFile")
+    @RequestMapping("/removeImage")
     public String removeImage(HttpServletRequest request) {
 
 	// get back sessionMAP
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/MonitoringController.java
===================================================================
diff -u -r9c66807dec11ccfe2299008ded08091f487a3478 -rb294a4ad71917a3740ef2250a5929d6de43866cf
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 9c66807dec11ccfe2299008ded08091f487a3478)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision b294a4ad71917a3740ef2250a5929d6de43866cf)
@@ -170,7 +170,7 @@
 	image.setHide(false);
 	igService.saveOrUpdateImageGalleryItem(image);
 
-	String redirect = "redirect:monitoring/summary.do";
+	String redirect = "redirect:/monitoring/summary.do";
 	redirect = WebUtil.appendParameterToURL(redirect, ImageGalleryConstants.ATTR_TOOL_CONTENT_ID,
 		contentId.toString());
 	String contentFolderID = (String) sessionMap.get(AttributeNames.PARAM_CONTENT_FOLDER_ID);
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ImageRatingForm.java
===================================================================
diff -u -r17eedca34ff3aaaee38fc4dc4a93301351379c60 -rb294a4ad71917a3740ef2250a5929d6de43866cf
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ImageRatingForm.java	(.../ImageRatingForm.java)	(revision 17eedca34ff3aaaee38fc4dc4a93301351379c60)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ImageRatingForm.java	(.../ImageRatingForm.java)	(revision b294a4ad71917a3740ef2250a5929d6de43866cf)
@@ -20,11 +20,8 @@
  * ****************************************************************
  */
 
-
 package org.lamsfoundation.lams.tool.imageGallery.web.form;
 
-import org.apache.struts.action.ActionForm;
-
 /**
  * Image star rating Form.
  *
Index: lams_tool_images/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r17eedca34ff3aaaee38fc4dc4a93301351379c60 -rb294a4ad71917a3740ef2250a5929d6de43866cf
--- lams_tool_images/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 17eedca34ff3aaaee38fc4dc4a93301351379c60)
+++ lams_tool_images/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision b294a4ad71917a3740ef2250a5929d6de43866cf)
@@ -10,6 +10,7 @@
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <c:set var="lams"><lams:LAMSURL/></c:set>
 
 <%@ attribute name="criterias" required="true" rtexprvalue="true" type="java.util.Collection" %>
@@ -283,10 +284,10 @@
 					<label for="minimum-rates">
 						<fmt:message key="${minimumLabel}" />
 					</label>
-					<form:select path="${formContentPrefix}minimumRates" id="minimum-rates" onmouseup="validateRatingLimits(true);" 
+					<form:select path="${formContentPrefix}minimumRates" id="minimum-rates" multiple="multiple" onmouseup="validateRatingLimits(true);" 
 							cssClass="form-control form-control-inline">
-						<form:option value="0" label="<fmt:message key="${noMinimumLabel}" />"/>
-						<form:option value="1" label="1"/>
+						<form:option value="0"><fmt:message key='${noMinimumLabel}' /></form:option>
+						<form:option value="1">1</form:option>
 						<form:option value="2" label="2"/>
 						<form:option value="3" label="3"/>
 						<form:option value="4" label="4"/>
@@ -301,9 +302,9 @@
 					<label for="maximum-rates">
 						<fmt:message key="${maximumLabel}" />
 					</label>
-					<form:select path="${formContentPrefix}maximumRates" id="maximum-rates" onmouseup="validateRatingLimits(false);" 
+					<form:select path="${formContentPrefix}maximumRates" id="maximum-rates" multiple="multiple" onmouseup="validateRatingLimits(false);" 
 							cssClass="form-control form-control-inline">
-						<form:option value="0" label="<fmt:message key="${noMaximumLabel}"/>
+						<form:option value="0"><fmt:message key='${noMaximumLabel}' /></form:option>
 						<form:option value="1" label="1"/>
 						<form:option value="2" label="2"/>
 						<form:option value="3" label="3"/>
Index: lams_tool_images/web/pages/authoring/advance.jsp
===================================================================
diff -u -r17eedca34ff3aaaee38fc4dc4a93301351379c60 -rb294a4ad71917a3740ef2250a5929d6de43866cf
--- lams_tool_images/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 17eedca34ff3aaaee38fc4dc4a93301351379c60)
+++ lams_tool_images/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision b294a4ad71917a3740ef2250a5929d6de43866cf)
@@ -84,12 +84,12 @@
 		</label>
 	</div>
 		
-	<c:if test='${!imageGalleryForm.imageGallery.allowRank}'><c:set var="id">display:none;</c:set></c:if>
+	<c:if test='${!imageGalleryForm.imageGallery.allowRank}'><c:set var="styleId">display:none;</c:set></c:if>
 	<lams:AuthoringRatingCriteria criterias="${sessionMap.ratingCriterias}" hasRatingLimits="true"
 		upLabel="label.authoring.up" downLabel="label.authoring.down"
 		allowCommentsLabel="label.authoring.advance.allow.learner.comment.images"
 		formContentPrefix="imageGallery"
-	    id="${id}"/>
+	    styleId="${styleId}"/>
 	
 </div>
 
Index: lams_tool_images/web/pages/authoring/basic.jsp
===================================================================
diff -u -r17eedca34ff3aaaee38fc4dc4a93301351379c60 -rb294a4ad71917a3740ef2250a5929d6de43866cf
--- lams_tool_images/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 17eedca34ff3aaaee38fc4dc4a93301351379c60)
+++ lams_tool_images/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision b294a4ad71917a3740ef2250a5929d6de43866cf)
@@ -82,7 +82,7 @@
     <label for="imageGallery.title">
     	<fmt:message key="label.authoring.basic.title"/>
     </label>
-    <input type="text" path="imageGallery.title" class="form-control"/>
+    <input type="text" name="imageGallery.title" value="Image Gallery" class="form-control"/>
 </div>
 
 <div class="form-group">
@@ -99,7 +99,7 @@
 	<%@ include file="/pages/authoring/parts/itemlist.jsp"%>
 </div>
 
-<c:url var="showMessageURL" value='/authoring/newImageInit.do'>
+<c:url var="showMessageURL" value="/authoring/newImageInit.do">
 	<c:param name="sessionMapID" value="${imageGalleryForm.sessionMapID}" />
 </c:url>
 <a href="#nogo" class="btn btn-default btn-sm" onclick="javascript:showMessage('${showMessageURL}')">
Index: lams_tool_images/web/pages/authoring/parts/addimage.jsp
===================================================================
diff -u -r17eedca34ff3aaaee38fc4dc4a93301351379c60 -rb294a4ad71917a3740ef2250a5929d6de43866cf
--- lams_tool_images/web/pages/authoring/parts/addimage.jsp	(.../addimage.jsp)	(revision 17eedca34ff3aaaee38fc4dc4a93301351379c60)
+++ lams_tool_images/web/pages/authoring/parts/addimage.jsp	(.../addimage.jsp)	(revision b294a4ad71917a3740ef2250a5929d6de43866cf)
@@ -1,7 +1,7 @@
 <%@ include file="/common/taglibs.jsp"%>
 <c:choose>
 	<c:when test="${saveUsingLearningAction}">
-		<c:set var="FORM_ACTION" value="/learning/saveNewImage.do"/>
+		<c:set var="FORM_ACTION" value="<lams:WebAppURL/>learning/saveNewImage.do"/>
 	</c:when>
 	<c:otherwise>
 		<c:set var="FORM_ACTION" value="saveOrUpdateImage.do"/>
@@ -35,7 +35,7 @@
 			    <label for="file-title">
 			    	<fmt:message key="label.authoring.basic.resource.title.input"/>
 			    </label>
-			    <input type="text" path="title" class="form-control input-sm" id="file-title" tabindex="1"/>
+			    <input type="text" name="title" value="${imageGalleryItemForm.title}" class="form-control input-sm" id="file-title" tabindex="1"/>
 			</div>
 		
 			<div class="form-group">
Index: lams_tool_images/web/pages/authoring/parts/itemlist.jsp
===================================================================
diff -u -r9c66807dec11ccfe2299008ded08091f487a3478 -rb294a4ad71917a3740ef2250a5929d6de43866cf
--- lams_tool_images/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 9c66807dec11ccfe2299008ded08091f487a3478)
+++ lams_tool_images/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision b294a4ad71917a3740ef2250a5929d6de43866cf)
@@ -30,7 +30,7 @@
 					
 					<td>
 						<a href="${mediumImagePath}" rel="lyteframe" title="${title}" rev="width: ${image.mediumImageWidth + 20}px; height: ${image.mediumImageHeight + 30}px; scrolling: auto;">
-							<c:out value="${image.title}" escapeXml="true"/>
+							<c:out value="${title}" escapeXml="true"/>
 						</a>
 					</td>
 					
Index: lams_tool_images/web/pages/learning/learning.jsp
===================================================================
diff -u -r9c66807dec11ccfe2299008ded08091f487a3478 -rb294a4ad71917a3740ef2250a5929d6de43866cf
--- lams_tool_images/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 9c66807dec11ccfe2299008ded08091f487a3478)
+++ lams_tool_images/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision b294a4ad71917a3740ef2250a5929d6de43866cf)
@@ -32,8 +32,8 @@
 	<c:set var="mediumImageDimensions" value="${sessionMap.mediumImageDimensions}" />
 	<c:set var="thumbnailImageDimensions" value="${empty sessionMap.thumbnailImageDimensions ? 100 : sessionMap.thumbnailImageDimensions}" />
 
-	<link rel="stylesheet" type="text/css" href="${lams}/includes/css/fotorama.css"/>
-	<link href="${lams}/includes/css/imageGallery.css" rel="stylesheet" type="text/css">
+	<link rel="stylesheet" type="text/css" href="<lams:WebAppURL/>/includes/css/fotorama.css"/>
+	<link href="<lams:WebAppURL/>includes/css/imageGallery.css" rel="stylesheet" type="text/css">
 	
     <lams:css suffix="jquery.jRating"/>
 	<link rel="stylesheet" type="text/css" href="${lams}css/jquery.tablesorter.theme-blue.css">
@@ -47,11 +47,11 @@
 		var LABEL_MAX_FILE_SIZE = '<fmt:message key="errors.maxfilesize"><param>{0}</param></fmt:message>';
 		var LABEL_NOT_ALLOWED_FORMAT = '<fmt:message key="error.resource.image.not.alowed.format"/>';
 	</script>
-	<script type="text/javascript" src="${lams}/includes/javascript/imageGalleryitem.js"></script>
-	<script type="text/javascript" src="${lams}/includes/javascript/uploadImageLearning.js"></script>
+	<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/imageGalleryitem.js"></script>
+	<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/uploadImageLearning.js"></script>
     <script type="text/javascript" src="${lams}includes/javascript/upload.js"></script>
  	<script type="text/javascript" src="${lams}includes/javascript/jquery.form.js"></script>
- 	<script type="text/javascript" src="${lams}/includes/javascript/fotorama.js"></script>
+ 	<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/fotorama.js"></script>
 	<script type="text/javascript">
 	
 		$(document).ready(function(){ 
@@ -86,9 +86,9 @@
 							</c:if>					
 						
 							{
-								img: "<lams:WebAppURL />/download/?uuid="+${image.mediumFileUuid}+"&preferDownload="+false,
-								//thumb: "<lams:WebAppURL />/download/?uuid="+${image.thumbnailFileUuid}+"&preferDownload="+false,
-								full: "<lams:WebAppURL />/download/?uuid="+${image.originalFileUuid}+"&preferDownload="+false,
+								img: "<lams:WebAppURL />download/?uuid="+${image.mediumFileUuid}+"&preferDownload="+false,
+								//thumb: ""<lams:WebAppURL />download/?uuid="+${image.thumbnailFileUuid}+"&preferDownload="+false,
+								full: "<lams:WebAppURL />download/?uuid="+${image.originalFileUuid}+"&preferDownload="+false,
 								id: '${image.uid}', // Custom anchor is used with the hash:true option.
 								caption: '<div class="caption-heading">${image.titleEscaped}</div>'
 									+ '${description}'
Index: lams_tool_images/web/pages/learning/notebook.jsp
===================================================================
diff -u -r9c66807dec11ccfe2299008ded08091f487a3478 -rb294a4ad71917a3740ef2250a5929d6de43866cf
--- lams_tool_images/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 9c66807dec11ccfe2299008ded08091f487a3478)
+++ lams_tool_images/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision b294a4ad71917a3740ef2250a5929d6de43866cf)
@@ -13,15 +13,15 @@
 			document.getElementById("finishButton").disabled = true;
 		}
 		function submitForm(methodName){
-			var f = document.getElementById('messageForm');
+			var f = document.getElementById('reflectionForm');
 			f.submit();
 		}
 	</script>
 </lams:head>
 <body class="stripes">
-	<lams:Page type="learner" title="${sessionMap.title}" formID="messageForm">
+	<lams:Page type="learner" title="${sessionMap.title}" formID="reflectionForm">
 		
-		<form:form action="submitReflection.do" method="post" onsubmit="disableFinishButton();" modelAttribute="reflectionForm" id="messageForm">
+		<form:form action="submitReflection.do" method="post" onsubmit="disableFinishButton();" modelAttribute="reflectionForm" id="reflectionForm">
 			<form:hidden path="userID" />
 			<form:hidden path="sessionMapID" />
 
Index: lams_tool_images/web/pages/learning/parts/commentsarea.jsp
===================================================================
diff -u -r17eedca34ff3aaaee38fc4dc4a93301351379c60 -rb294a4ad71917a3740ef2250a5929d6de43866cf
--- lams_tool_images/web/pages/learning/parts/commentsarea.jsp	(.../commentsarea.jsp)	(revision 17eedca34ff3aaaee38fc4dc4a93301351379c60)
+++ lams_tool_images/web/pages/learning/parts/commentsarea.jsp	(.../commentsarea.jsp)	(revision b294a4ad71917a3740ef2250a5929d6de43866cf)
@@ -33,7 +33,7 @@
 	</script>
 	<script type="text/javascript" src="${lams}includes/javascript/rating.js"></script>
 </c:if>
-<script type="text/javascript" src="${lams}includes/javascript/uploadImageLearning.js'/>"></script>
+<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/uploadImageLearning.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery.jRating.js"></script>
 <script type="text/javascript">
 	$(document).ready(function(){
Index: lams_tool_images/web/pages/monitoring/editactivity.jsp
===================================================================
diff -u -r9c66807dec11ccfe2299008ded08091f487a3478 -rb294a4ad71917a3740ef2250a5929d6de43866cf
--- lams_tool_images/web/pages/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision 9c66807dec11ccfe2299008ded08091f487a3478)
+++ lams_tool_images/web/pages/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision b294a4ad71917a3740ef2250a5929d6de43866cf)
@@ -29,7 +29,7 @@
 
 	<tr>
 		<td colspan="2">
-			<c:url  var="authoringUrl" value="/definelater.do">
+			<c:url  var="authoringUrl" value="/authoring/definelater.do">
 				<c:param name="toolContentID" value="${sessionMap.toolContentID}" />
 				<c:param name="contentFolderID" value="${sessionMap.contentFolderID}" />
 			</c:url>
Index: lams_tool_images/web/pages/monitoring/imagesummary.jsp
===================================================================
diff -u -r17eedca34ff3aaaee38fc4dc4a93301351379c60 -rb294a4ad71917a3740ef2250a5929d6de43866cf
--- lams_tool_images/web/pages/monitoring/imagesummary.jsp	(.../imagesummary.jsp)	(revision 17eedca34ff3aaaee38fc4dc4a93301351379c60)
+++ lams_tool_images/web/pages/monitoring/imagesummary.jsp	(.../imagesummary.jsp)	(revision b294a4ad71917a3740ef2250a5929d6de43866cf)
@@ -62,7 +62,7 @@
 				    <label for="file-title">
 				    	<fmt:message key="label.authoring.basic.resource.title.input"/>
 				    </label>
-				    <input type="text" path="title" class="form-control" id="file-title" tabindex="1"/>
+				    <input type="text" name="title" value="${imageGalleryItemForm.title}" class="form-control" id="file-title" tabindex="1"/>
 				</div>
 				
 				<div class="form-group">
@@ -136,7 +136,7 @@
 				<a href="#nogo" onclick="javascript:self.parent.tb_remove();" class="btn btn-default roffset5">
 					<fmt:message key="label.cancel" /> 
 				</a>
-				<a href="#nogo" onclick="javascript:document.imageGalleryItemForm.submit();" class="btn btn-default">
+				<a href="#nogo" onclick="javascript:document.forms.imageGalleryItemForm.submit();" class="btn btn-default">
 					<fmt:message key="label.monitoring.imagesummary.save" /> 
 				</a>
 			</div>
Index: lams_tool_images/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r9c66807dec11ccfe2299008ded08091f487a3478 -rb294a4ad71917a3740ef2250a5929d6de43866cf
--- lams_tool_images/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 9c66807dec11ccfe2299008ded08091f487a3478)
+++ lams_tool_images/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision b294a4ad71917a3740ef2250a5929d6de43866cf)
@@ -63,8 +63,8 @@
 			var LABEL_MAX_FILE_SIZE = '<fmt:message key="errors.maxfilesize"><param>{0}</param></fmt:message>';
 			var LABEL_NOT_ALLOWED_FORMAT = '<fmt:message key="error.resource.image.not.alowed.format"/>';
 		</script>
-		<script type="text/javascript" src="${lams}includes/javascript/imageGalleryitem.js'/>"></script>
-		<script type="text/javascript" src="${lams}includes/javascript/uploadImageLearning.js'/>"></script>
+		<script type="text/javascript" src="<lams:WebAppURL />includes/javascript/imageGalleryitem.js"></script>
+		<script type="text/javascript" src="<lams:WebAppURL />includes/javascript/uploadImageLearning.js"></script>
     	<script type="text/javascript" src="${lams}includes/javascript/upload.js"></script>
  		<script type="text/javascript" src="${lams}includes/javascript/thickbox.js"></script>
 		<script type="text/javascript" src="${lams}includes/javascript/monitorToolSummaryAdvanced.js" ></script>
Index: lams_tool_images/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r9c66807dec11ccfe2299008ded08091f487a3478 -rb294a4ad71917a3740ef2250a5929d6de43866cf
--- lams_tool_images/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 9c66807dec11ccfe2299008ded08091f487a3478)
+++ lams_tool_images/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision b294a4ad71917a3740ef2250a5929d6de43866cf)
@@ -244,7 +244,7 @@
 <div id="manage-image-buttons">
 	<div class="panel panel-default" >
 		<div class="panel-heading">
-			<button onclick="javascript:newImageInit('<lams:WebAppURL />authoring/newImageInit.do?sessionMapID=${sessionMapID}&saveUsingLearningAction=true');"
+			<button onclick="javascript:newImageInit('<c:url value="/authoring/newImageInit.do?sessionMapID=${sessionMapID}&saveUsingLearningAction=true"/>');"
 					class="btn btn-default btn-xs loffset5  " id="">  
 				<i class="fa fa-upload"></i> <fmt:message key="label.learning.add.new.image" />
 			</button>