Index: lams_tool_pixlr/web/pages/learning/pixlr.jsp
===================================================================
diff -u -r2d2c869032858b474398c651f8c45371410ba0d2 -re508f067f2bb1975ccea77bda7a50f92c7b13b5d
--- lams_tool_pixlr/web/pages/learning/pixlr.jsp	(.../pixlr.jsp)	(revision 2d2c869032858b474398c651f8c45371410ba0d2)
+++ lams_tool_pixlr/web/pages/learning/pixlr.jsp	(.../pixlr.jsp)	(revision e508f067f2bb1975ccea77bda7a50f92c7b13b5d)
@@ -126,22 +126,22 @@
 				
 				<%--Finish buttons--------------------------------------------------%>
 				
-				<form:form action="finishActivity.do" method="post" onsubmit="disableFinishButton();" id="learningForm" modelAttribute="learningForm">
+				<form:form action="learning/finishActivity.do" method="post" onsubmit="disableFinishButton();" id="learningForm" modelAttribute="learningForm">
 					<form:hidden path="toolSessionID" id="toolSessionID"/>
 					<form:hidden path="mode" value="${mode}" />	
 					<div class="voffset10 pull-right">
 						
 						<c:choose>
 							<c:when test="${pixlrDTO.allowViewOthersImages}">
-								<button type="button" class="btn btn-primary" onclick="javascript:document.getElementById('dispatch').value = 'viewAllImages';">
+								<button class="btn btn-primary" onclick="javascript:document.getElementById("learningForm").action = 'viewAllImages.do';">
 									<fmt:message key="button.viewAll" />
 								</button>
 							</c:when>
 							
 							<c:otherwise>
 								<c:choose>
 									<c:when test="${!pixlrUserDTO.finishedActivity and pixlrDTO.reflectOnActivity}">
-										<button type="button" class="btn btn-primary" onclick="javascript:document.getElementById('dispatch').value = 'openNotebook';">
+										<button class="btn btn-primary" onclick="javascript:document.getElementById("learningForm").action = 'openNotebook.do';">
 											<fmt:message key="button.continue" />
 										</button>
 									</c:when>