Index: lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java,v
diff -u -r1.9 -r1.10
--- lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java	10 Nov 2008 13:59:14 -0000	1.9
+++ lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java	11 Apr 2011 12:36:26 -0000	1.10
@@ -28,6 +28,7 @@
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
@@ -41,30 +42,39 @@
 import org.lamsfoundation.lams.contentrepository.NodeKey;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.usermanagement.User;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.usermanagement.exception.UserAccessDeniedException;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 import org.lamsfoundation.lams.util.CentralToolContentHandler;
+import org.lamsfoundation.lams.util.FileUtilException;
+import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.PortraitUtils;
+import org.lamsfoundation.lams.web.action.LamsDispatchAction;
+import org.lamsfoundation.lams.web.session.SessionManager;
+import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
 /**
  * @author jliew
  * @author Andrey Balan
  * 
- * @struts:action path="/saveportrait" name="PortraitActionForm" input=".portrait" scope="request" validate="false"
+ * @struts:action path="/saveportrait" parameter="method" name="PortraitActionForm" input=".portrait" scope="request" validate="false"
  * 
  * @struts:action-forward name="profile" path="/index.do?state=active&tab=profile"
  * @struts:action-forward name="errors" path="/index.do?state=active&tab=portrait"
  */
-public class PortraitSaveAction extends Action {
+public class PortraitSaveAction extends LamsDispatchAction {
 
     private static Logger log = Logger.getLogger(PortraitSaveAction.class);
     private static IUserManagementService service;
     private static CentralToolContentHandler centralToolContentHandler;
     private static int LARGEST_DIMENSION = 120;
 
-    @Override
-    public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+    /**
+     * Upload portrait image.
+     */
+    public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws Exception {
 
 	if (isCancelled(request)) {
@@ -73,11 +83,6 @@
 
 	ActionMessages errors = new ActionMessages();
 
-	WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet()
-		.getServletContext());
-	PortraitSaveAction.centralToolContentHandler = (CentralToolContentHandler) wac
-		.getBean("centralToolContentHandler");
-
 	PortraitActionForm portraitForm = (PortraitActionForm) form;
 	FormFile file = portraitForm.getFile();
 	String fileName = file.getFileName();
@@ -107,7 +112,7 @@
 	if ((file != null) && !StringUtils.isEmpty(fileName)) {
 	    try {
 		fileName = fileName.substring(0, fileName.indexOf('.')) + ".jpg";		
-		node = PortraitSaveAction.centralToolContentHandler.uploadFile(is, fileName, file.getContentType(),
+		node = getCentralToolContentHandler().uploadFile(is, fileName, file.getContentType(),
 			IToolContentHandler.TYPE_ONLINE);
 		is.close();
 	    } catch (Exception e) {
@@ -120,21 +125,74 @@
 
 	// delete old portrait file (we only want to keep the user's current portrait)
 	if (user.getPortraitUuid() != null) {
-	    PortraitSaveAction.centralToolContentHandler.deleteFile(user.getPortraitUuid());
+	    getCentralToolContentHandler().deleteFile(user.getPortraitUuid());
 	}
 	user.setPortraitUuid(node.getUuid());
 	getService().save(user);
 
 	return mapping.findForward("profile");
     }
+    
+    
+    /**
+     * Save portrait taken from web camera.
+     */
+    public ActionForward saveWebcamPortrait(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws Exception {
 
+	// check if there is a session with logged in user
+	HttpSession ss = SessionManager.getSession();
+	UserDTO userDTO = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	User user = getService().getUserByLogin(request.getRemoteUser());
+	if ((userDTO == null) || (user == null)) {
+	    throw new UserAccessDeniedException("User hasn't been logged in");
+	}
+
+	// check if the file is an image using the MIME content type
+	String mediaType = request.getContentType().split("/", 2)[0];
+	if (!mediaType.equals("image")) {
+	    throw new FileUtilException("The file is not an image.");
+	}
+
+	// check if there is an input stream
+	InputStream is = request.getInputStream();
+	if (is == null) {
+	    throw new FileUtilException("Sorry, there has been an error.");
+	}
+
+	// write to content repository
+	String fileName = user.getFullName() + " portrait.jpg";
+	NodeKey node = getCentralToolContentHandler().uploadFile(is, fileName, "image/jpeg", IToolContentHandler.TYPE_ONLINE);
+	is.close();
+
+	log.debug("saved file with uuid: " + node.getUuid() + " and version: " + node.getVersion());
+
+	// delete old portrait file (we only want to keep the user's current portrait)
+	if (user.getPortraitUuid() != null) {
+	    getCentralToolContentHandler().deleteFile(user.getPortraitUuid());
+	}
+	user.setPortraitUuid(node.getUuid());
+	getService().save(user);
+
+	return null;
+    }
+    
+    private CentralToolContentHandler getCentralToolContentHandler() {
+	if (centralToolContentHandler == null) {
+	    WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet()
+		    .getServletContext());
+	    centralToolContentHandler = (CentralToolContentHandler) wac.getBean("centralToolContentHandler");
+	}
+	return centralToolContentHandler;
+    }
+
     private IUserManagementService getService() {
 	if (PortraitSaveAction.service == null) {
 	    WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet()
 		    .getServletContext());
 	    PortraitSaveAction.service = (IUserManagementService) ctx.getBean("userManagementService");
 	}
-	return PortraitSaveAction.service;
+	return service;
     }
 }
 
Index: lams_central/web/portrait.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/portrait.jsp,v
diff -u -r1.6 -r1.7
--- lams_central/web/portrait.jsp	28 Jan 2009 00:12:15 -0000	1.6
+++ lams_central/web/portrait.jsp	11 Apr 2011 12:36:26 -0000	1.7
@@ -5,54 +5,165 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<html:form action="/saveportrait.do" method="post"
-	enctype="multipart/form-data">
-	<html:hidden name="PortraitActionForm" property="portraitUuid" />
+<link type="text/css" href="css/jquery-ui-1.8.11.redmont-theme.css" rel="stylesheet">
+<style media="screen,projection" type="text/css">
+	.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited, .ui-state-active a:hover  {
+	    color: #47bc23 !important;
+	    background-image: none;
+	    background-color: transparent ;
+	}
+	
+	.button {font-size:11px; font-family: verdana, arial, helvetica, sans-serif;}
+	.tableCaptions {text-align: right; vertical-align: top; width: 30%;}
+	#accordion h3 a {border-bottom: 0;}
+	#accordion div {text-align: center;}
+	#accordion p {text-align: center; padding-bottom: 0px; margin-bottom: 0xp;}
+	#webcam {padding-bottom: 17px;}
+</style>
 
+<script language="JavaScript" type="text/javascript" src="includes/javascript/jquery.blockUI.js"></script>
+<script language="JavaScript" type="text/javascript" src="includes/javascript/jquery-ui-1.8.11.custom.min.js"></script>
+<script language="JavaScript" type="text/javascript" src="includes/javascript/webcam.js"></script>	
+<script language="JavaScript">
+	webcam.set_swf_url( "includes/flash/webcam.swf" );
+	webcam.set_shutter_sound( true, "includes/sounds/shutter.mp3" ); // play shutter click sound
+	webcam.set_api_url( '<c:url value="/saveportrait.do"/>?method=saveWebcamPortrait' );
+	webcam.set_quality( 100 ); // JPEG quality (1 - 100)
+	//set onComplete callback
+	webcam.set_hook( 'onComplete', 'onCompleteWebcam' );
+	function onCompleteWebcam(response) {
+		window.location.href = '<c:url value="/index.do"/>?tab=profile';
+	}	
+	//set onError callback
+	webcam.set_hook( 'onError', 'onErrorWebcam' );
+	function onErrorWebcam(msg) {
+		var activeHeader = $( "#accordion" ).accordion( "option", "active" );
+		if (activeHeader == "0") {
+			alert($( "#webcam" ).attr("height") + "JPEGCam Flash Error: " + msg);
+		}
+		return true;
+	}
+	
+	jQuery(document).ready(function(){
+		//initialize webcam
+		$( "#accordion" ).accordion({
+			autoHeight: false,
+			create: function(event, ui) {
+				$( "#webcam" ).html(webcam.get_html(320, 240, 120, 90));
+			},
+			change: function(event, ui) {
+				if (ui.newHeader[0].id == "webcamHeader") {
+					hideConfirmationButtons();
+					$( "#webcam" ).html(webcam.get_html(320, 240, 120, 90));
+				} else {
+					$( "#webcam" ).html("");
+				}
+			}
+		});
+		
+        $('#takeSnapshot').click(function() { 
+    		webcam.freeze();
+    		showConfirmationButtons();
+        }); 
+        
+        $('#uploadWebcam').click(function() { 
+	   		$.blockUI({ message: '<h1><img src="images/loading.gif" style="padding-right:25px;"> <fmt:message key="label.portrait.please.wait" /> </h1>' });
+	 		webcam.upload();
+	 		hideConfirmationButtons();
+        });
+        
+        $('#resetWebcam').click(function() { 
+    		webcam.reset();
+    		hideConfirmationButtons();
+        });
+        
+        function hideConfirmationButtons() {
+    		$('#takeSnapshotArea').show();
+    		$('#uploadToServerArea').hide();	
+        }
+        
+        function showConfirmationButtons() {
+    		$('#takeSnapshotArea').hide();
+    		$('#uploadToServerArea').show();	
+        }
+	});
+	
+</script>
 
+<html:form action="/saveportrait.do" method="post" enctype="multipart/form-data" >
+	<html:hidden name="PortraitActionForm" property="portraitUuid" />
+
 	<div style="clear:both"></div>
 
-	<h2 class="small-space-top"><fmt:message
-		key="title.portrait.change.screen" /></h2>
+	<h2 class="small-space-top">
+		<fmt:message key="title.portrait.change.screen" />
+	</h2>
 
-	<div class="shading-bg"><logic:messagesPresent>
-		<p class="warning"><html:errors /></p>
-	</logic:messagesPresent>
+	<div class="shading-bg">
+		<logic:messagesPresent>
+			<p class="warning"><html:errors /></p>
+		</logic:messagesPresent>
 
 	<table>
 		<tr>
-			<td class="align-right" valign="top" width="50%"><fmt:message
-				key="label.portrait.current" />:</td>
-			<td width="50%"><logic:notEqual name="PortraitActionForm"
-				property="portraitUuid" value="0">
-				<img class="img-border"
-					src="/lams/download/?uuid=<bean:write name="PortraitActionForm" property="portraitUuid" />&preferDownload=false" />
-			</logic:notEqual> <logic:equal name="PortraitActionForm" property="portraitUuid"
-				value="0">
-				<c:set var="lams">
-					<lams:LAMSURL />
-				</c:set>
-				<em><fmt:message key="msg.portrait.none" /></em>
+			<td class="tableCaptions">
+				<fmt:message key="label.portrait.current" />:
+			</td>
+			<td>
+				<logic:notEqual name="PortraitActionForm" property="portraitUuid" value="0">
+					<img class="img-border" src="/lams/download/?uuid=<bean:write name="PortraitActionForm" property="portraitUuid" />&preferDownload=false" />
+				</logic:notEqual> 
 				
-			</logic:equal></td>
+				<logic:equal name="PortraitActionForm" property="portraitUuid" value="0">
+					<c:set var="lams">
+						<lams:LAMSURL />
+					</c:set>
+					<em><fmt:message key="msg.portrait.none" /></em>
+				</logic:equal>
+			</td>
 		</tr>
+		
 		<tr>
-			<td class="align-right"><fmt:message key="label.portrait.upload" />:</td>
-			<td><html:file property="file" /></td>
-		</tr>
-		<tr>
-		<td>&nbsp;</td>
+			<td class="tableCaptions">
+				<fmt:message key="label.portrait.create.new.portrait" />
+			</td>
 			<td>
-			<html:submit styleClass="button"><fmt:message key="button.save" />	
-			</html:submit>  
-			<html:cancel styleClass="button"><fmt:message key="button.cancel" />
-			</html:cancel>
+				<div id="accordion">
+				    <h3 id="webcamHeader"><a href="#"><fmt:message key="label.portrait.take.snapshot.from.webcamera" /></a></h3>
+				    <div>
+						<div id="webcam"></div>
+						
+						<!-- Some buttons for controlling things -->
+						<div id="takeSnapshotArea">	
+							<a href="javascript:webcam.configure();" class="button"><fmt:message key='label.portrait.configure' /></a>	
+							<a id="takeSnapshot" class="button" href="javascript:return false;"><fmt:message key='label.portrait.take.snapshot' /></a>		
+						</div>	
+						<div id="uploadToServerArea" style="display: none;">		
+							<div style="padding-bottom: 13px;"><fmt:message key='label.portrait.do.you.like.results' /></div>
+						
+							<a class="button" id="uploadWebcam" href="javascript:return false;"><fmt:message key='label.portrait.yes.set.it.as.portrait' /></a>
+							<a class="button" id="resetWebcam" href="javascript:return false;"><fmt:message key='label.portrait.no.take.another.one' /></a>
+						</div>
+				    </div>
+				    
+				    <h3><a href="#"><fmt:message key="label.portrait.upload" /></a></h3>
+				    <div>
+				   		<html:file property="file" />
+						<br/><br/>
+						<a class="button" href="javascript:document.PortraitActionForm.submit();"><fmt:message key="button.save" /></a>
+						<a class="button" href="<c:url value='/index.do'/>?tab=profile"><fmt:message key="button.cancel" /></a>
+
+						<p> 
+							<fmt:message key="msg.portrait.resized" />  
+						</p>
+				    </div>
+				</div>
 			
 			</td>
 		</tr>
 	</table>
 
 	</div>
 
-	<p align="center"> <fmt:message key="msg.portrait.resized" />  </p>
+	
 </html:form>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_central/web/css/jquery-ui-1.8.11.redmont-theme.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/web/images/css/jquery-ui.redmond-theme/ui-bg_flat_0_aaaaaa_40x100.png
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/images/css/jquery-ui.redmond-theme/Attic/ui-bg_flat_0_aaaaaa_40x100.png,v
diff -u -r1.1 -r1.2
Binary files differ
Index: lams_central/web/images/css/jquery-ui.redmond-theme/ui-bg_flat_55_fbec88_40x100.png
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/images/css/jquery-ui.redmond-theme/Attic/ui-bg_flat_55_fbec88_40x100.png,v
diff -u -r1.1 -r1.2
Binary files differ
Index: lams_central/web/images/css/jquery-ui.redmond-theme/ui-bg_glass_75_d0e5f5_1x400.png
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/images/css/jquery-ui.redmond-theme/Attic/ui-bg_glass_75_d0e5f5_1x400.png,v
diff -u -r1.1 -r1.2
Binary files differ
Index: lams_central/web/images/css/jquery-ui.redmond-theme/ui-bg_glass_85_dfeffc_1x400.png
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/images/css/jquery-ui.redmond-theme/Attic/ui-bg_glass_85_dfeffc_1x400.png,v
diff -u -r1.1 -r1.2
Binary files differ
Index: lams_central/web/images/css/jquery-ui.redmond-theme/ui-bg_glass_95_fef1ec_1x400.png
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/images/css/jquery-ui.redmond-theme/Attic/ui-bg_glass_95_fef1ec_1x400.png,v
diff -u -r1.1 -r1.2
Binary files differ
Index: lams_central/web/images/css/jquery-ui.redmond-theme/ui-bg_gloss-wave_55_5c9ccc_500x100.png
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/images/css/jquery-ui.redmond-theme/Attic/ui-bg_gloss-wave_55_5c9ccc_500x100.png,v
diff -u -r1.1 -r1.2
Binary files differ
Index: lams_central/web/images/css/jquery-ui.redmond-theme/ui-bg_inset-hard_100_f5f8f9_1x100.png
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/images/css/jquery-ui.redmond-theme/Attic/ui-bg_inset-hard_100_f5f8f9_1x100.png,v
diff -u -r1.1 -r1.2
Binary files differ
Index: lams_central/web/images/css/jquery-ui.redmond-theme/ui-bg_inset-hard_100_fcfdfd_1x100.png
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/images/css/jquery-ui.redmond-theme/Attic/ui-bg_inset-hard_100_fcfdfd_1x100.png,v
diff -u -r1.1 -r1.2
Binary files differ
Index: lams_central/web/images/css/jquery-ui.redmond-theme/ui-icons_217bc0_256x240.png
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/images/css/jquery-ui.redmond-theme/Attic/ui-icons_217bc0_256x240.png,v
diff -u -r1.1 -r1.2
Binary files differ
Index: lams_central/web/images/css/jquery-ui.redmond-theme/ui-icons_2e83ff_256x240.png
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/images/css/jquery-ui.redmond-theme/Attic/ui-icons_2e83ff_256x240.png,v
diff -u -r1.1 -r1.2
Binary files differ
Index: lams_central/web/images/css/jquery-ui.redmond-theme/ui-icons_469bdd_256x240.png
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/images/css/jquery-ui.redmond-theme/Attic/ui-icons_469bdd_256x240.png,v
diff -u -r1.1 -r1.2
Binary files differ
Index: lams_central/web/images/css/jquery-ui.redmond-theme/ui-icons_6da8d5_256x240.png
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/images/css/jquery-ui.redmond-theme/Attic/ui-icons_6da8d5_256x240.png,v
diff -u -r1.1 -r1.2
Binary files differ
Index: lams_central/web/images/css/jquery-ui.redmond-theme/ui-icons_cd0a0a_256x240.png
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/images/css/jquery-ui.redmond-theme/Attic/ui-icons_cd0a0a_256x240.png,v
diff -u -r1.1 -r1.2
Binary files differ
Index: lams_central/web/images/css/jquery-ui.redmond-theme/ui-icons_d8e7f3_256x240.png
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/images/css/jquery-ui.redmond-theme/Attic/ui-icons_d8e7f3_256x240.png,v
diff -u -r1.1 -r1.2
Binary files differ
Index: lams_central/web/images/css/jquery-ui.redmond-theme/ui-icons_f9bd01_256x240.png
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/images/css/jquery-ui.redmond-theme/Attic/ui-icons_f9bd01_256x240.png,v
diff -u -r1.1 -r1.2
Binary files differ
Index: lams_central/web/includes/flash/webcam.swf
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/flash/webcam.swf,v
diff -u -r1.1 -r1.2
Binary files differ
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_central/web/includes/javascript/jquery-ui-1.8.11.custom.min.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_central/web/includes/javascript/jquery.blockUI.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_central/web/includes/javascript/webcam.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/web/includes/sounds/shutter.mp3
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/sounds/shutter.mp3,v
diff -u -r1.1 -r1.2
Binary files differ