Index: lams_central/web/portrait.jsp
===================================================================
diff -u -r3bbfff28c52eb3fb1c0fa2efa59e975d65062d42 -rb0e43d3189749133af52bc2e225ce1533a33a11a
--- lams_central/web/portrait.jsp	(.../portrait.jsp)	(revision 3bbfff28c52eb3fb1c0fa2efa59e975d65062d42)
+++ lams_central/web/portrait.jsp	(.../portrait.jsp)	(revision b0e43d3189749133af52bc2e225ce1533a33a11a)
@@ -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>