Index: lams_tool_images/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.3 -r1.4
--- lams_tool_images/conf/language/lams/ApplicationResources.properties	10 Dec 2008 14:53:03 -0000	1.3
+++ lams_tool_images/conf/language/lams/ApplicationResources.properties	11 Dec 2008 12:37:40 -0000	1.4
@@ -86,6 +86,7 @@
 label.monitoring.edit.activity.edit  =Edit
 label.monitoring.summary.overall.summary  =Overall Summary
 label.monitoring.summary.title.reflection  =Notebook Entry
+label.monitoring.summary.add.new.image  =Add new image
 label.monitoring.imagesummary.image.summary  =Image Summary
 label.monitoring.imagesummary.save  =Save
 label.monitoring.imagesummary.user  =Learner
Index: lams_tool_images/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.13 -r1.14
--- lams_tool_images/conf/language/lams/ApplicationResources_en_AU.properties	10 Dec 2008 14:53:03 -0000	1.13
+++ lams_tool_images/conf/language/lams/ApplicationResources_en_AU.properties	11 Dec 2008 12:37:40 -0000	1.14
@@ -86,6 +86,7 @@
 label.monitoring.edit.activity.edit  =Edit
 label.monitoring.summary.overall.summary  =Overall Summary
 label.monitoring.summary.title.reflection  =Notebook Entry
+label.monitoring.summary.add.new.image  =Add new image
 label.monitoring.imagesummary.image.summary  =Image Summary
 label.monitoring.imagesummary.save  =Save
 label.monitoring.imagesummary.user  =Learner
Index: lams_tool_images/conf/language/rams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/conf/language/rams/Attic/ApplicationResources.properties,v
diff -u -r1.3 -r1.4
--- lams_tool_images/conf/language/rams/ApplicationResources.properties	10 Dec 2008 14:53:03 -0000	1.3
+++ lams_tool_images/conf/language/rams/ApplicationResources.properties	11 Dec 2008 12:37:40 -0000	1.4
@@ -86,6 +86,7 @@
 label.monitoring.edit.activity.edit  =Edit
 label.monitoring.summary.overall.summary  =Overall Summary
 label.monitoring.summary.title.reflection  =Notebook Entry
+label.monitoring.summary.add.new.image  =Add new image
 label.monitoring.imagesummary.image.summary  =Image Summary
 label.monitoring.imagesummary.save  =Save
 label.monitoring.imagesummary.user  =Learner
Index: lams_tool_images/conf/language/rams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/conf/language/rams/Attic/ApplicationResources_en_AU.properties,v
diff -u -r1.3 -r1.4
--- lams_tool_images/conf/language/rams/ApplicationResources_en_AU.properties	10 Dec 2008 14:53:03 -0000	1.3
+++ lams_tool_images/conf/language/rams/ApplicationResources_en_AU.properties	11 Dec 2008 12:37:40 -0000	1.4
@@ -86,6 +86,7 @@
 label.monitoring.edit.activity.edit  =Edit
 label.monitoring.summary.overall.summary  =Overall Summary
 label.monitoring.summary.title.reflection  =Notebook Entry
+label.monitoring.summary.add.new.image  =Add new image
 label.monitoring.imagesummary.image.summary  =Image Summary
 label.monitoring.imagesummary.save  =Save
 label.monitoring.imagesummary.user  =Learner
Index: lams_tool_images/conf/xdoclet/struts-actions.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/conf/xdoclet/struts-actions.xml,v
diff -u -r1.8 -r1.9
--- lams_tool_images/conf/xdoclet/struts-actions.xml	8 Dec 2008 22:01:00 -0000	1.8
+++ lams_tool_images/conf/xdoclet/struts-actions.xml	11 Dec 2008 12:37:40 -0000	1.9
@@ -210,6 +210,23 @@
 			parameter="summary" >
 			<forward name="success" path="/pages/monitoring/monitoring.jsp" />
 		</action>
+		<action path="/monitoring/newImageInit"
+			type="org.lamsfoundation.lams.tool.imageGallery.web.action.MonitoringAction"
+			parameter="newImageInit"
+			name="imageGalleryItemForm" 
+			scope="request" 
+			validate="false">
+			<forward name="success" path="/pages/monitoring/parts/addimage.jsp" />
+		</action>
+		<action path="/monitoring/saveNewImage"
+			type="org.lamsfoundation.lams.tool.imageGallery.web.action.MonitoringAction"
+			parameter="saveNewImage"
+			name="imageGalleryItemForm" 
+			scope="request" 
+			validate="false">
+			<forward name="image" path="/pages/monitoring/parts/addimage.jsp" />
+			<forward name="success" path="/pages/monitoring/start.jsp" />
+		</action>		
 		<action path="/monitoring/imageSummary"
 			type="org.lamsfoundation.lams.tool.imageGallery.web.action.MonitoringAction"
 			parameter="imageSummary"
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.5 -r1.6
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/MonitoringAction.java	4 Dec 2008 12:01:36 -0000	1.5
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/MonitoringAction.java	11 Dec 2008 12:37:40 -0000	1.6
@@ -25,13 +25,17 @@
 package org.lamsfoundation.lams.tool.imageGallery.web.action;
 
 import java.io.IOException;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.math.NumberUtils;
@@ -45,6 +49,7 @@
 import org.apache.struts.action.ActionMessages;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
+import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.imageGallery.ImageGalleryConstants;
 import org.lamsfoundation.lams.tool.imageGallery.dto.ReflectDTO;
 import org.lamsfoundation.lams.tool.imageGallery.dto.Summary;
@@ -56,9 +61,13 @@
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryUser;
 import org.lamsfoundation.lams.tool.imageGallery.service.IImageGalleryService;
 import org.lamsfoundation.lams.tool.imageGallery.service.ImageGalleryException;
+import org.lamsfoundation.lams.tool.imageGallery.service.UploadImageGalleryFileException;
 import org.lamsfoundation.lams.tool.imageGallery.web.form.ImageCommentForm;
 import org.lamsfoundation.lams.tool.imageGallery.web.form.ImageGalleryItemForm;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.FileValidatorUtil;
 import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.lamsfoundation.lams.web.util.SessionMap;
 import org.springframework.web.context.WebApplicationContext;
@@ -77,6 +86,12 @@
 	if (param.equals("summary")) {
 	    return summary(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("imageSummary")) {
 	    return imageSummary(mapping, form, request, response);
 	}
@@ -135,6 +150,62 @@
     }
     
     /**
+     * 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) {
+	ImageGalleryItemForm itemForm = (ImageGalleryItemForm) form;
+	String sessionMapID = request.getParameter(ImageGalleryConstants.ATTR_SESSION_MAP_ID);
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	request.setAttribute(ImageGalleryConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
+	return mapping.findForward(ImageGalleryConstants.SUCCESS);
+    }
+
+    /**
+     * Save imageGallery item into database.
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     */
+    private ActionForward saveNewImage(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
+	ImageGalleryItemForm itemForm = (ImageGalleryItemForm) form;
+	String sessionMapID = itemForm.getSessionMapID();
+	request.setAttribute(ImageGalleryConstants.ATTR_SESSION_MAP_ID, sessionMapID);
+	
+	ActionErrors errors = validateImageGalleryItem(itemForm);
+
+	if (!errors.isEmpty()) {
+	    this.addErrors(request, errors);
+	    return mapping.findForward("image");
+	}
+
+	try {
+	    extractFormToImageGalleryItem(request, itemForm);
+	} catch (Exception e) {
+	    // any upload exception will display as normal error message rather then throw exception directly
+	    errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(ImageGalleryConstants.ERROR_MSG_UPLOAD_FAILED,
+		    e.getMessage()));
+	    if (!errors.isEmpty()) {
+		this.addErrors(request, errors);
+		return mapping.findForward("image");
+	    }
+	}
+	
+	//redirect
+	return mapping.findForward(ImageGalleryConstants.SUCCESS);
+    }
+    
+    /**
      * Display edit page for existed imageGallery item.
      * 
      * @param mapping
@@ -189,11 +260,13 @@
 	// get back sessionMAP
 	ImageGalleryItemForm imageForm = (ImageGalleryItemForm) form;
 	String sessionMapID = imageForm.getSessionMapID();
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
-	request.setAttribute(ImageGalleryConstants.ATTR_SESSION_MAP_ID, sessionMap
-		.get(AttributeNames.PARAM_CONTENT_FOLDER_ID));
+	request.setAttribute(ImageGalleryConstants.ATTR_SESSION_MAP_ID, sessionMapID);
 
-	extractFormToImageGalleryItem(request, imageForm);
+	try {
+	    extractFormToImageGalleryItem(request, imageForm);
+	} catch (UploadImageGalleryFileException e) {
+	    // UploadImageGalleryFileException will no occur here, only in case when new image gallery item is creating
+	}
 
 	return mapping.findForward(ImageGalleryConstants.SUCCESS);
     }
@@ -386,20 +459,62 @@
      * 
      * @param request
      * @param imageForm
+     * @throws UploadImageGalleryFileException 
      * @throws ImageGalleryException
      */
-    private void extractFormToImageGalleryItem(HttpServletRequest request, ImageGalleryItemForm imageForm){
+    private void extractFormToImageGalleryItem(HttpServletRequest request, ImageGalleryItemForm imageForm) throws UploadImageGalleryFileException{
 
 	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(imageForm.getSessionMapID());
 	IImageGalleryService service = getImageGalleryService();
+	Long contentId = (Long) sessionMap.get(ImageGalleryConstants.ATTR_TOOL_CONTENT_ID);
+	ImageGallery imageGallery = service.getImageGalleryByContentId(contentId);
 
-	Long imageUid = new Long(imageForm.getImageUid());
-	ImageGalleryItem image = service.getImageGalleryItemByUid(imageUid);
+	int imageUid = NumberUtils.stringToInt(imageForm.getImageUid(), -1);
+	ImageGalleryItem image = null;
+	if (imageUid == -1) { // add
+	    image = new ImageGalleryItem();
+	    image.setCreateDate(new Timestamp(new Date().getTime()));
+	    
+	    //setting SequenceId
+	    Set<ImageGalleryItem> imageList = imageGallery.getImageGalleryItems();
+	    int maxSeq = 0;
+	    for (ImageGalleryItem dbImage : imageList) {
+		if (dbImage.getSequenceId() > maxSeq) {
+		    maxSeq = dbImage.getSequenceId();
+		}
+	    }
+	    image.setSequenceId(maxSeq + 1);
 
+	    // upload ImageGalleryItem file
+	    // and setting file properties' fields: item.setFileUuid(); item.setFileVersionId(); item.setFileType();
+	    // item.setFileName();
+	    if (imageForm.getFile() != null) {
+		try {
+		    service.uploadImageGalleryItemFile(image, imageForm.getFile());
+		} catch (UploadImageGalleryFileException e) {
+		    // remove new image!
+		    throw e;
+		}
+	    }
+
+	    HttpSession ss = SessionManager.getSession();
+	    // get back login user DTO
+	    UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	    ImageGalleryUser imageGalleryUser = service.getUserByIDAndContent(new Long(user.getUserID().intValue()),
+		    imageGallery.getContentId());
+	    image.setCreateBy(imageGalleryUser);	
+	    image.setCreateByAuthor(true);
+	    
+	    imageList.add(image);
+	    imageGallery.setImageGalleryItems(imageList);
+	    service.saveOrUpdateImageGallery(imageGallery);
+
+	} else { // edit
+	    image = service.getImageGalleryItemByUid(new Long(imageUid));
+	}
+	
 	String title = imageForm.getTitle();
 	if (StringUtils.isBlank(title)) {
-	    Long contentId = (Long) sessionMap.get(ImageGalleryConstants.ATTR_TOOL_CONTENT_ID);
-	    ImageGallery imageGallery = service.getImageGalleryByContentId(contentId);
 	    Long nextConsecutiveImageTitle = imageGallery.getNextImageTitle();
 	    imageGallery.setNextImageTitle(nextConsecutiveImageTitle + 1);
 	    service.saveOrUpdateImageGallery(imageGallery);
@@ -409,7 +524,39 @@
 	image.setTitle(title);
 
 	image.setDescription(imageForm.getDescription());
+	image.setHide(false);
 	service.saveOrUpdateImageGalleryItem(image);
     }
+    
+    /**
+     * Validate imageGallery item.
+     * 
+     * @param itemForm
+     * @return
+     */
+    private ActionErrors validateImageGalleryItem(ImageGalleryItemForm itemForm) {
+	ActionErrors errors = new ActionErrors();
 
+	// validate file size
+	FileValidatorUtil.validateFileSize(itemForm.getFile(), true, errors);
+	// for edit validate: file already exist
+	if ((itemForm.getFile() == null) || StringUtils.isEmpty(itemForm.getFile().getFileName())) {
+	    errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(ImageGalleryConstants.ERROR_MSG_FILE_BLANK));
+	}
+
+	// check for allowed format : gif, png, jpg
+	if (itemForm.getFile() != null) {
+	    String contentType = itemForm.getFile().getContentType();
+	    if (StringUtils.isEmpty(contentType)
+		    || !(contentType.equals("image/gif") || contentType.equals("image/png")
+			    || contentType.equals("image/jpg") || contentType.equals("image/jpeg") || contentType
+			    .equals("image/pjpeg") || contentType.equals("image/x-png"))) {
+		errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(
+			ImageGalleryConstants.ERROR_MSG_NOT_ALLOWED_FORMAT));
+	    }
+	}
+
+	return errors;
+    }
+
 }
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.2 -r1.3
--- lams_tool_images/web/pages/monitoring/start.jsp	2 Dec 2008 17:17:18 -0000	1.2
+++ lams_tool_images/web/pages/monitoring/start.jsp	11 Dec 2008 12:37:40 -0000	1.3
@@ -5,7 +5,7 @@
 
 <html>
 	<body class="stripes">
-		<c:set var="sessionMapID" value="${param.sessionMapID}" />
+		<c:set var="sessionMapID" value="${sessionMapID}" />
 		<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
 		<script type="text/javascript">
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.6 -r1.7
--- lams_tool_images/web/pages/monitoring/summary.jsp	11 Dec 2008 10:13:27 -0000	1.6
+++ lams_tool_images/web/pages/monitoring/summary.jsp	11 Dec 2008 12:37:40 -0000	1.7
@@ -303,3 +303,9 @@
 	</c:if>
 
 </c:forEach>
+
+<div class="space-top">
+	<a href="<html:rewrite page='/monitoring/newImageInit.do?sessionMapID='/>${sessionMapID}&KeepThis=true&TB_iframe=true&height=500&width=480&modal=true" class="button add_new_image thickbox">  
+		<fmt:message key="label.monitoring.summary.add.new.image" />
+	</a>
+</div>
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
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_images/web/pages/monitoring/parts/addimage.jsp	11 Dec 2008 12:37:40 -0000	1.1
@@ -0,0 +1,70 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
+		"http://www.w3.org/TR/html4/loose.dtd">
+		
+<%@ include file="/common/taglibs.jsp"%>
+
+<lams:html>
+	<lams:head>
+		<title>
+			<fmt:message key="label.learning.title" />
+		</title>
+		<%@ include file="/common/headerWithoutPrototype.jsp"%>
+		
+		
+		
+	</lams:head>
+	
+	<body class="stripes">
+	
+		<div id="content" >
+		
+			<%@ include file="/common/messages.jsp"%>
+			
+			<html:form action="/monitoring/saveNewImage" method="post" styleId="imageGalleryItemForm" enctype="multipart/form-data">
+				<html:hidden property="sessionMapID" />
+	
+				<h2 class="no-space-left">
+					<fmt:message key="label.authoring.basic.add.image" />
+				</h2>
+	
+				<div class="field-name">
+					<fmt:message key="label.authoring.basic.resource.title.input" />
+				</div>
+				<html:text property="title" size="55" tabindex="1" />
+		
+				<div class="field-name space-top">
+	            	<fmt:message key="label.authoring.basic.resource.description.input" />
+				</div>
+				<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+				<c:set var="sessionMap"	value="${sessionScope[formBean.sessionMapID]}" />
+				<div class="small-space-bottom" >
+					<lams:STRUTS-textarea rows="5" cols="20" tabindex="4" styleClass="text-area" property="description" />
+				</div>
+	
+				<div class="field-name space-top">
+					<fmt:message key="label.authoring.basic.resource.file.input" />
+				</div>
+				<div id="itemAttachmentArea">
+					<input type="file" name="file" />			
+				</div>
+			</html:form>
+
+			<br><br>
+	
+			<lams:ImgButtonWrapper>
+				<a href="#" onclick="document.imageGalleryItemForm.submit();" class="button-add-item">
+					<fmt:message key="label.authoring.basic.add.image" /> 
+				</a>
+				<a href="#" onclick="self.parent.tb_remove();" class="button space-left">
+					<fmt:message key="label.cancel" /> 
+				</a>
+			</lams:ImgButtonWrapper>
+		
+		</div>
+		<!--closes content-->
+	
+		<div id="footer">
+		</div>
+		<!--closes footer-->		
+	</body>
+</lams:html>