Index: lams_central/web/portrait.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/portrait.jsp,v
diff -u -r1.8 -r1.8.2.1
--- lams_central/web/portrait.jsp	29 Sep 2012 13:56:32 -0000	1.8
+++ lams_central/web/portrait.jsp	14 Oct 2016 03:43:03 -0000	1.8.2.1
@@ -1,169 +1,249 @@
+
 <%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-bean" prefix="bean"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-logic" prefix="logic"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
-
-<link type="text/css" href="css/jquery-ui-redmond-theme.css" rel="stylesheet">
+<link rel="stylesheet" href="css/defaultHTML_learner.css"
+	type="text/css" />
 <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;}
+.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 type="text/javascript"
+	src="/lams/includes/javascript/bootstrap.min.js"></script>
+<script language="JavaScript" type="text/javascript"
+	src="includes/javascript/jquery.blockUI.js"></script>
+<script language="JavaScript" type="text/javascript"
+	src="includes/javascript/webcam.js"></script>
 
-<script language="JavaScript" type="text/javascript" src="includes/javascript/jquery.blockUI.js"></script>
-<script language="JavaScript" type="text/javascript" src="includes/javascript/jquery-ui.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)
+	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' );
+	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' );
+	webcam.set_hook('onError', 'onErrorWebcam');
 	function onErrorWebcam(msg) {
-		var activeHeader = $( "#accordion" ).accordion( "option", "active" );
+		var activeHeader = $("#accordion").accordion("option", "active");
 		if (activeHeader == "0") {
-			alert($( "#webcam" ).attr("height") + "JPEGCam Flash Error: " + msg);
+			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();	
-        }
-	});
-	
+
+	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:form action="/saveportrait.do" method="post"
+	enctype="multipart/form-data">
 	<html:hidden name="PortraitActionForm" property="portraitUuid" />
+	<div style="clear: both"></div>
+	<div class="container">
+		<div class="row vertical-center-row">
+			<div
+				class="col-xs-12 col-sm-8 col-sm-offset-2 col-md-6 col-md-offset-3">
+				<div class="panel panel-default">
+					<div class="panel-heading">
+						<div class="panel-title">
+							<fmt:message key="index.myprofile" />
+						</div>
+					</div>
+					<div class="panel-body">
+						<div class="text-center">
+							<fmt:message key="label.portrait.current" />
+							:
 
-	<div style="clear:both"></div>
+							<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>
 
-	<h2 class="small-space-top">
-		<fmt:message key="title.portrait.change.screen" />
-	</h2>
+							<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>
+						</div>
 
-	<div class="shading-bg">
-		<logic:messagesPresent>
-			<p class="warning"><html:errors /></p>
-		</logic:messagesPresent>
+						<div class="panel-group" id="accordion" role="tablist"
+							aria-multiselectable="true">
 
-	<table>
-		<tr>
-			<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 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="tableCaptions">
-				<fmt:message key="label.portrait.create.new.portrait" />
-			</td>
-			<td>
-				<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 class="panel-group" id="accordion" role="tablist"
+								aria-multiselectable="true">
+								<div class="panel panel-default">
+									<div class="panel-heading" role="tab" id="webcamHeader">
+										<h4 class="panel-title">
+											<a role="button" data-toggle="collapse"
+												data-parent="#accordion" href="#collapseOne"
+												aria-expanded="true" aria-controls="collapseOne"> <fmt:message
+													key="label.portrait.take.snapshot.from.webcamera" />
+											</a>
+										</h4>
 
-	</div>
+									</div>
+									<div id="collapseOne" class="panel-collapse collapse in"
+										role="tabpanel" aria-labelledby="webcamHeader">
+										<div class="panel-body">
+											<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>
 
-	
-</html:form>
+												<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>
+									</div>
+								</div>
+
+								<div class="panel panel-default">
+									<div class="panel-heading" role="tab" id="headingTwo">
+										<h4 class="panel-title">
+											<a class="collapsed" role="button" data-toggle="collapse"
+												data-parent="#accordion" href="#collapseTwo"
+												aria-expanded="false" aria-controls="collapseTwo"> <fmt:message
+													key="label.portrait.upload" />
+											</a>
+										</h4>
+									</div>
+									<div id="collapseTwo" class="panel-collapse collapse"
+										role="tabpanel" aria-labelledby="headingTwo">
+										<div class="panel-body">
+											<html:file property="file" />
+											<br />
+											<br /> <a class="btn btn-sm btn-default offset5"
+												href="javascript:document.PortraitActionForm.submit();"
+												role="button"><fmt:message key="button.save" /></a> <a
+												class="btn btn-sm btn-default offset5" role="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>
+								</div>
+
+
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+</html:form>
\ No newline at end of file