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.2.11 -r1.27.2.12
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java	9 Mar 2017 19:54:59 -0000	1.27.2.11
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java	23 Mar 2017 20:10:28 -0000	1.27.2.12
@@ -99,15 +99,9 @@
 	if (param.equals("finish")) {
 	    return finish(mapping, form, request, response);
 	}
-	if (param.equals("newImageInit")) {
-	    return newImageInit(mapping, form, request, response);
-	}
 	if (param.equals("saveNewImage")) {
 	    return saveNewImage(mapping, form, request, response);
 	}
-	if (param.equals("initMultipleImages")) {
-	    return initMultipleImages(mapping, form, request, response);
-	}
 	if (param.equals("saveMultipleImages")) {
 	    return saveMultipleImages(mapping, form, request, response);
 	}
@@ -298,25 +292,6 @@
     }
 
     /**
-     * Initial page for add imageGallery item (single file or URL).
-     *
-     * @param mapping
-     * @param form
-     * @param request
-     * @param response
-     * @return
-     */
-    private ActionForward newImageInit(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) {
-	String sessionMapID = WebUtil.readStrParam(request, ImageGalleryConstants.ATTR_SESSION_MAP_ID);
-	request.setAttribute(ImageGalleryConstants.ATTR_SESSION_MAP_ID, sessionMapID);
-
-	ImageGalleryItemForm itemForm = (ImageGalleryItemForm) form;
-	itemForm.setSessionMapID(sessionMapID);
-	return mapping.findForward(ImageGalleryConstants.SUCCESS);
-    }
-
-    /**
      * Save file or url imageGallery item into database.
      *
      * @param mapping
@@ -356,25 +331,6 @@
     }
 
     /**
-     * Initial page for add imageGallery item (single file or URL).
-     *
-     * @param mapping
-     * @param form
-     * @param request
-     * @param response
-     * @return
-     */
-    private ActionForward initMultipleImages(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) {
-	String sessionMapID = WebUtil.readStrParam(request, ImageGalleryConstants.ATTR_SESSION_MAP_ID);
-	request.setAttribute(ImageGalleryConstants.ATTR_SESSION_MAP_ID, sessionMapID);
-
-	MultipleImagesForm multipleForm = (MultipleImagesForm) form;
-	multipleForm.setSessionMapID(sessionMapID);
-	return mapping.findForward(ImageGalleryConstants.SUCCESS);
-    }
-
-    /**
      * Save file or url imageGallery item into database.
      *
      * @param mapping
Index: lams_tool_images/web/WEB-INF/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/WEB-INF/Attic/struts-config.xml,v
diff -u -r1.1.2.4 -r1.1.2.5
--- lams_tool_images/web/WEB-INF/struts-config.xml	9 Mar 2017 19:54:59 -0000	1.1.2.4
+++ lams_tool_images/web/WEB-INF/struts-config.xml	23 Mar 2017 20:10:28 -0000	1.1.2.5
@@ -172,29 +172,13 @@
 			parameter="finish" >
 			<forward name="success" path="/pages/learning/finish.jsp" />
 		</action>
-		<action path="/learning/newImageInit"
-			type="org.lamsfoundation.lams.tool.imageGallery.web.action.LearningAction"
-			parameter="newImageInit"
-			name="imageGalleryItemForm" 
-			scope="request" 
-			validate="false">
-			<forward name="success" path="/pages/learning/parts/addimage.jsp" />
-		</action>
 		<action path="/learning/saveNewImage"
 			type="org.lamsfoundation.lams.tool.imageGallery.web.action.LearningAction"
 			parameter="saveNewImage"
 			name="imageGalleryItemForm" 
 			scope="request" 
 			validate="false">
 		</action>
-		<action path="/learning/initMultipleImages"
-			type="org.lamsfoundation.lams.tool.imageGallery.web.action.LearningAction"
-			name="multipleImagesForm" 
-			scope="request" 
-			validate="false"			
-			parameter="initMultipleImages">
-			<forward name="success" path="/pages/learning/parts/addmultipleimages.jsp" />
-		</action>
 		<action path="/learning/saveMultipleImages"
 			type="org.lamsfoundation.lams.tool.imageGallery.web.action.LearningAction"
 			parameter="saveMultipleImages"
Index: lams_tool_images/web/includes/javascript/imageGalleryitem.js
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/includes/javascript/imageGalleryitem.js,v
diff -u -r1.4.2.7 -r1.4.2.8
--- lams_tool_images/web/includes/javascript/imageGalleryitem.js	28 Feb 2017 12:33:43 -0000	1.4.2.7
+++ lams_tool_images/web/includes/javascript/imageGalleryitem.js	23 Mar 2017 20:10:28 -0000	1.4.2.8
@@ -70,7 +70,8 @@
         processData: false,
         contentType: false,
     	success: function(data) {
-   			$('#new-image-input-area').html(data);
+    		//invoke callback function in case image was successfully uploaded
+    		imageUploadedCallback();
     	},
     	error: function(jqXHR, textStatus, errorMessage) {
     		$('#uploadButtons').show();
@@ -148,7 +149,8 @@
         processData: false,
         contentType: false,
     	success: function(data) {
-    		$('#new-image-input-area').html(data);
+    		//invoke callback function in case image was successfully uploaded
+    		imageUploadedCallback();
     	},
     	error: function(jqXHR, textStatus, errorMessage) {
     		$('#uploadButtons').show();
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_images/web/includes/javascript/uploadImageLearning.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.2.7 -r1.6.2.8
--- lams_tool_images/web/pages/authoring/authoring.jsp	9 Mar 2017 19:54:59 -0000	1.6.2.7
+++ lams_tool_images/web/pages/authoring/authoring.jsp	23 Mar 2017 20:10:28 -0000	1.6.2.8
@@ -41,6 +41,11 @@
 	    	// end optional tab controller stuff
 	    	selectTab(tabId);
         }
+        
+        //callback method that is invoked after image has been successfully uploaded to the server
+        function imageUploadedCallback() {
+        	$('#new-image-input-area').html(data);
+        }
     </script>
  
 </lams:head>
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.13 -r1.3.2.14
--- lams_tool_images/web/pages/authoring/parts/addimage.jsp	9 Mar 2017 19:54:59 -0000	1.3.2.13
+++ lams_tool_images/web/pages/authoring/parts/addimage.jsp	23 Mar 2017 20:10:28 -0000	1.3.2.14
@@ -1,5 +1,14 @@
 <%@ include file="/common/taglibs.jsp"%>
-<html:form action="/authoring/saveOrUpdateImage" method="post" styleId="imageGalleryItemForm" enctype="multipart/form-data">
+<c:choose>
+	<c:when test="${sessionMap.mode == 'author'}">
+		<c:set var="FORM_ACTION" value="/authoring/saveOrUpdateImage"/>
+	</c:when>
+	<c:otherwise>
+		<c:set var="FORM_ACTION" value="/learning/saveNewImage.do"/>
+	</c:otherwise>
+</c:choose>
+				
+<html:form action="${FORM_ACTION}" method="post" styleId="imageGalleryItemForm" enctype="multipart/form-data">
 	<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 	<c:set var="sessionMap"	value="${sessionScope[formBean.sessionMapID]}" />
 	
@@ -34,10 +43,18 @@
 				<label for="description">
 					<fmt:message key="label.authoring.basic.resource.description.input" />
 				</label>
-	            	
-				<lams:CKEditor id="description" value="${formBean.description}" width="99%" 
-					contentFolderID="${sessionMap.imageGalleryForm.contentFolderID}" 
-					resizeParentFrameName="new-image-input-area" />
+				
+				<c:choose>
+					<c:when test="${sessionMap.mode == 'author'}">
+						<lams:CKEditor id="description" value="${formBean.description}" width="99%" 
+							contentFolderID="${sessionMap.imageGalleryForm.contentFolderID}" 
+							resizeParentFrameName="new-image-input-area" />
+					</c:when>
+					<c:otherwise>
+						<lams:STRUTS-textarea rows="5" tabindex="2" styleClass="text-area form-control" property="description" />
+					</c:otherwise>
+				</c:choose>
+				
 			</div>
 				
 			<div class="form-group">
Index: lams_tool_images/web/pages/authoring/parts/imagefile.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/authoring/parts/imagefile.jsp,v
diff -u -r1.1.10.6 -r1.1.10.7
--- lams_tool_images/web/pages/authoring/parts/imagefile.jsp	9 Mar 2017 19:54:59 -0000	1.1.10.6
+++ lams_tool_images/web/pages/authoring/parts/imagefile.jsp	23 Mar 2017 20:10:28 -0000	1.1.10.7
@@ -2,7 +2,14 @@
 <%@ page import="org.lamsfoundation.lams.util.Configuration" %>
 <%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %>
 <%@ page import="org.lamsfoundation.lams.util.FileValidatorUtil" %>
-<c:set var="UPLOAD_FILE_MAX_SIZE_AS_USER_STRING"><%=FileValidatorUtil.formatSize(Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE))%></c:set>
+<c:choose>
+	<c:when test="${sessionMap.mode == 'teacher'}">
+		<c:set var="UPLOAD_FILE_MAX_SIZE_AS_USER_STRING"><%=FileValidatorUtil.formatSize(Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE))%></c:set>
+	</c:when>
+	<c:otherwise>
+		<c:set var="UPLOAD_FILE_MAX_SIZE_AS_USER_STRING"><%=FileValidatorUtil.formatSize(Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_MAX_SIZE))%></c:set>
+	</c:otherwise>
+</c:choose>
 <c:set var="ctxPath" value="${pageContext.request.contextPath}"	scope="request" />
 
 <input type="hidden" name="hasFile" value="${itemAttachment.hasFile}" id="has-file"/>
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.9 -r1.29.2.10
--- lams_tool_images/web/pages/learning/learning.jsp	9 Mar 2017 19:54:59 -0000	1.29.2.9
+++ lams_tool_images/web/pages/learning/learning.jsp	23 Mar 2017 20:10:28 -0000	1.29.2.10
@@ -1,5 +1,15 @@
 <!DOCTYPE html>
 <%@ include file="/common/taglibs.jsp"%>
+<%@ page import="org.lamsfoundation.lams.util.Configuration" %>
+<%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %>
+<c:choose>
+	<c:when test="${sessionMap.mode == 'teacher'}">
+		<c:set var="UPLOAD_FILE_MAX_SIZE"><%=Configuration.get(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE)%></c:set>
+	</c:when>
+	<c:otherwise>
+		<c:set var="UPLOAD_FILE_MAX_SIZE"><%=Configuration.get(ConfigurationKeys.UPLOAD_FILE_MAX_SIZE)%></c:set>
+	</c:otherwise>
+</c:choose>
 
 <lams:html>
 <lams:head>
@@ -20,7 +30,6 @@
 	<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}css/thickbox.css">
 	<link rel="stylesheet" type="text/css" href="<html:rewrite page='/includes/css/fotorama.css'/>"/>
 	<style media="screen,projection" type="text/css">
 		@media (max-width: 750px) {
@@ -82,6 +91,17 @@
 	<link rel="stylesheet" type="text/css" href="${lams}css/jquery.tablesorter.theme-blue.css">
 	<link rel="stylesheet" type="text/css" href="${lams}css/jquery.tablesorter.pager.css">
     
+    <script type="text/javascript">
+		<%-- used for  imageGalleryitem.js --%>
+		var saveMultipleImagesUrl = "<c:url value='/learning/saveMultipleImages.do'/>";
+		var UPLOAD_FILE_LARGE_MAX_SIZE = "${UPLOAD_FILE_MAX_SIZE}";
+		var LABEL_ITEM_BLANK = '<fmt:message key="error.resource.item.file.blank"/>';
+		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="<html:rewrite page='/includes/javascript/imageGalleryitem.js'/>"></script>
+	<script type="text/javascript" src="<html:rewrite page='/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="<html:rewrite page='/includes/javascript/fotorama.js'/>"></script>
 	<script type="text/javascript">
Fisheye: Tag 1.3.2.9 refers to a dead (removed) revision in file `lams_tool_images/web/pages/learning/parts/addimage.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.10.9 refers to a dead (removed) revision in file `lams_tool_images/web/pages/learning/parts/addmultipleimages.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.2.9 -r1.12.2.10
--- lams_tool_images/web/pages/learning/parts/commentsarea.jsp	17 Nov 2016 16:36:08 -0000	1.12.2.9
+++ lams_tool_images/web/pages/learning/parts/commentsarea.jsp	23 Mar 2017 20:10:28 -0000	1.12.2.10
@@ -10,7 +10,6 @@
 <c:set var="finishedLock" value="${sessionMap.finishedLock}" />
 <c:set var="isImageSelected" value="${not empty sessionMap.currentImage}" />
 
-<script type="text/javascript" src="${lams}includes/javascript/thickbox.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
 <c:if test="${isImageSelected}">
 	<script type="text/javascript">
@@ -31,6 +30,7 @@
 	</script>
 	<script type="text/javascript" src="${lams}includes/javascript/rating.js"></script>
 </c:if>
+<script type="text/javascript" src="<html:rewrite page='/includes/javascript/uploadImageLearning.js'/>"></script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery.jRating.js"></script>
 <script type="text/javascript">
 	$(document).ready(function(){
@@ -96,17 +96,17 @@
 			
 			<%--"Check for new", "Add new image" and "Delete" buttons---------------%>
 				
-			<div class="btn-group" role="group">	
+			<div id="manage-image-buttons" class="btn-group" role="group">	
 				<c:if test="${imageGallery.allowShareImages}">
-					<button href="#nogo" onclick="return checkNew()" class="btn btn-sm btn-default" id="check-for-new-button"> 
+					<button onclick="return checkNew()" class="btn btn-sm btn-default" id="check-for-new-button"> 
 						<i class="fa fa-refresh"></i> <fmt:message key="label.check.for.new" /> 
 					</button>
 								
 					<c:if test="${not finishedLock}">
-						<a href="<html:rewrite page='/learning/newImageInit.do?sessionMapID='/>${sessionMapID}&KeepThis=true&TB_iframe=true&modal=true" 
-								class="btn btn-default btn-sm thickbox" id="add-new-image-button">  
+						<button onclick="javascript:newImageInit('<html:rewrite page='/authoring/newImageInit.do'/>?sessionMapID=${sessionMapID}');"
+								class="btn btn-default btn-sm" id="add-new-image-button">  
 							<i class="fa fa-upload"></i> <fmt:message key="label.learning.add.new.image" />
-						</a>
+						</button>
 					</c:if>
 					
 					<c:if test="${sessionMap.isAuthor}">
@@ -115,6 +115,10 @@
 						</button>
 					</c:if>
 				</c:if>
-			</div>
+			</div>		
 	</div>
+							
+	<c:if test="${imageGallery.allowShareImages && !finishedLock}">
+		<div id="new-image-input-area" class="voffset20"></div>
+	</c:if>	
 </c:if>
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.2.7 -r1.9.2.8
--- lams_tool_images/web/pages/monitoring/monitoring.jsp	17 Nov 2016 16:36:08 -0000	1.9.2.7
+++ lams_tool_images/web/pages/monitoring/monitoring.jsp	23 Mar 2017 20:10:28 -0000	1.9.2.8
@@ -1,6 +1,16 @@
 <!DOCTYPE html>
 <%@ include file="/common/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.tool.imageGallery.ImageGalleryConstants"%>
+<%@ page import="org.lamsfoundation.lams.util.Configuration" %>
+<%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %>
+<c:choose>
+	<c:when test="${sessionMap.mode == 'teacher'}">
+		<c:set var="UPLOAD_FILE_MAX_SIZE"><%=Configuration.get(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE)%></c:set>
+	</c:when>
+	<c:otherwise>
+		<c:set var="UPLOAD_FILE_MAX_SIZE"><%=Configuration.get(ConfigurationKeys.UPLOAD_FILE_MAX_SIZE)%></c:set>
+	</c:otherwise>
+</c:choose>
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
 
 <lams:html>
@@ -22,7 +32,7 @@
 				padding-bottom: 10px;
 				padding-top: 10px;
 			}
-			#add-image-container {
+			#manage-image-buttons {
 				margin-bottom: 10px;
 				overflow: hidden;
 			}
@@ -44,7 +54,17 @@
 			COMMENT_TEXTAREA_TIP_LABEL = '',
 			WARN_COMMENTS_IS_BLANK_LABEL = '',
 			WARN_MIN_NUMBER_WORDS_LABEL = '';
+
+			<%-- used for  imageGalleryitem.js --%>
+			var saveMultipleImagesUrl = "<c:url value='/learning/saveMultipleImages.do'/>";
+			var UPLOAD_FILE_LARGE_MAX_SIZE = "${UPLOAD_FILE_MAX_SIZE}";
+			var LABEL_ITEM_BLANK = '<fmt:message key="error.resource.item.file.blank"/>';
+			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="<html:rewrite page='/includes/javascript/imageGalleryitem.js'/>"></script>
+		<script type="text/javascript" src="<html:rewrite page='/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>
 		<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter.js"></script>
@@ -76,9 +96,7 @@
 			}
 			
 			function checkNew(){
-				var monitorURL = window.location.href;
-				document.location.href = monitorURL;
-	 		    return false;
+				location.reload();
 			}			
 			
 			$(document).ready(function(){
Index: lams_tool_images/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/monitoring/summary.jsp,v
diff -u -r1.16.2.5 -r1.16.2.6
--- lams_tool_images/web/pages/monitoring/summary.jsp	9 Mar 2017 19:54:59 -0000	1.16.2.5
+++ lams_tool_images/web/pages/monitoring/summary.jsp	23 Mar 2017 20:10:28 -0000	1.16.2.6
@@ -224,11 +224,17 @@
 	</div> <!--  end panel group -->
 </c:if>
 
-<P id="add-image-container">
-	<a href="<html:rewrite page='/learning/newImageInit.do?sessionMapID='/>${sessionMapID}&KeepThis=true&TB_iframe=true&modal=true" 
-			class="btn btn-default btn-xs loffset5 voffset10 pull-right thickbox">  
-		<i class="fa fa-plus"></i>&nbsp;<fmt:message key="label.monitoring.summary.add.new.image" />
-	</a>
-</P>
-
 <%@ include file="parts/advanceOptions.jsp"%>
+
+<div id="manage-image-buttons">
+	<div class="panel panel-default" >
+		<div class="panel-heading">
+			<button onclick="javascript:newImageInit('<html:rewrite page='/authoring/newImageInit.do'/>?sessionMapID=${sessionMapID}');"
+					class="btn btn-default btn-xs loffset5  " id="">  
+				<i class="fa fa-upload"></i> <fmt:message key="label.learning.add.new.image" />
+			</button>
+		</div>
+	</div>
+</div>
+
+<div id="new-image-input-area" class="voffset20"></div>
\ No newline at end of file