Index: lams_tool_dimdim/web/pages/admin/admin.jsp
===================================================================
diff -u -rf273f605d3c64f4ce6a52818f3fb5268b5db4fc9 -rfe43b12d31adee5cde99ef1a2ac42125211b2004
--- lams_tool_dimdim/web/pages/admin/admin.jsp	(.../admin.jsp)	(revision f273f605d3c64f4ce6a52818f3fb5268b5db4fc9)
+++ lams_tool_dimdim/web/pages/admin/admin.jsp	(.../admin.jsp)	(revision fe43b12d31adee5cde99ef1a2ac42125211b2004)
@@ -9,11 +9,13 @@
 	<html:form action="/admin/save">
 
 		<div>
-			<fmt:message key="admin.dimdimServerURL" /> : <html:text property="dimdimServerURL" />
+			<fmt:message key="admin.dimdimServerURL" />
+			:
+			<html:text property="dimdimServerURL" />
 		</div>
 		<div class="align-right">
 			<html:submit styleClass="button">
-				<fmt:message key="label.save"/>
+				<fmt:message key="label.save" />
 			</html:submit>
 		</div>
 	</html:form>
Index: lams_tool_dimdim/web/pages/authoring/advanced.jsp
===================================================================
diff -u -r718613f72e0fc64be2db39de3c6c3682852d815b -rfe43b12d31adee5cde99ef1a2ac42125211b2004
--- lams_tool_dimdim/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision 718613f72e0fc64be2db39de3c6c3682852d815b)
+++ lams_tool_dimdim/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision fe43b12d31adee5cde99ef1a2ac42125211b2004)
@@ -20,7 +20,8 @@
 </p>
 
 <p>
-	<html:textarea property="reflectInstructions" cols="30" rows="3" styleId="reflectInstructions"/>
+	<html:textarea property="reflectInstructions" cols="30" rows="3"
+		styleId="reflectInstructions" />
 </p>
 
 <script type="text/javascript">
Index: lams_tool_dimdim/web/pages/authoring/authoring.jsp
===================================================================
diff -u -rd5314b799a1d54d0a172c05468a6ec63efc6c514 -rfe43b12d31adee5cde99ef1a2ac42125211b2004
--- lams_tool_dimdim/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision d5314b799a1d54d0a172c05468a6ec63efc6c514)
+++ lams_tool_dimdim/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision fe43b12d31adee5cde99ef1a2ac42125211b2004)
@@ -1,7 +1,6 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<%@ page
-	import="org.lamsfoundation.lams.tool.dimdim.util.Constants"%>
+<%@ page import="org.lamsfoundation.lams.tool.dimdim.util.Constants"%>
 
 <html:form action="/authoring" styleId="authoringForm" method="post"
 	enctype="multipart/form-data">
@@ -41,11 +40,12 @@
 			</c:if>
 			<logic:messagesPresent>
 				<p class="warning">
-				        <html:messages id="error">
-				            <c:out value="${error}" escapeXml="false"/><br/>
-				        </html:messages>
+					<html:messages id="error">
+						<c:out value="${error}" escapeXml="false" />
+						<br />
+					</html:messages>
 				</p>
-			</logic:messagesPresent>			
+			</logic:messagesPresent>
 		</div>
 
 		<lams:help toolSignature="<%=Constants.TOOL_SIGNATURE%>"
@@ -64,7 +64,7 @@
 			cancelButtonLabelKey="button.cancel" saveButtonLabelKey="button.save"
 			toolContentID="${sessionMap.toolContentID}"
 			accessMode="${sessionMap.mode}" defineLater="${defineLater}"
-			customiseSessionID="${sessionMap.sessionID}" 
+			customiseSessionID="${sessionMap.sessionID}"
 			contentFolderID="${sessionMap.contentFolderID}" />
 	</div>
 </html:form>
Index: lams_tool_dimdim/web/pages/authoring/instructions.jsp
===================================================================
diff -u -r4c8de20e6e3ea73f98892f70662508e4011e96f6 -rfe43b12d31adee5cde99ef1a2ac42125211b2004
--- lams_tool_dimdim/web/pages/authoring/instructions.jsp	(.../instructions.jsp)	(revision 4c8de20e6e3ea73f98892f70662508e4011e96f6)
+++ lams_tool_dimdim/web/pages/authoring/instructions.jsp	(.../instructions.jsp)	(revision fe43b12d31adee5cde99ef1a2ac42125211b2004)
@@ -112,7 +112,8 @@
 			<div class="field-name-alternative-color">
 				<fmt:message key="instructions.offlineInstructions"></fmt:message>
 			</div>
-			<lams:STRUTS-textarea property="offlineInstruction" rows="3" cols="75" />
+			<lams:STRUTS-textarea property="offlineInstruction" rows="3"
+				cols="75" />
 		</td>
 	</tr>
 
Index: lams_tool_dimdim/web/pages/export/exportPortfolio.jsp
===================================================================
diff -u -rf273f605d3c64f4ce6a52818f3fb5268b5db4fc9 -rfe43b12d31adee5cde99ef1a2ac42125211b2004
--- lams_tool_dimdim/web/pages/export/exportPortfolio.jsp	(.../exportPortfolio.jsp)	(revision f273f605d3c64f4ce6a52818f3fb5268b5db4fc9)
+++ lams_tool_dimdim/web/pages/export/exportPortfolio.jsp	(.../exportPortfolio.jsp)	(revision fe43b12d31adee5cde99ef1a2ac42125211b2004)
@@ -13,9 +13,9 @@
 	<body class="stripes">
 
 		<div id="content">
-			
+
 			<p>
-				<fmt:message key="export.toolExportNotSupported"/>
+				<fmt:message key="export.toolExportNotSupported" />
 			</p>
 
 		</div>
Index: lams_tool_dimdim/web/pages/learning/learning.jsp
===================================================================
diff -u -r7c68a5b7c9e928e763d087d92d8dd17170f2cb67 -rfe43b12d31adee5cde99ef1a2ac42125211b2004
--- lams_tool_dimdim/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 7c68a5b7c9e928e763d087d92d8dd17170f2cb67)
+++ lams_tool_dimdim/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision fe43b12d31adee5cde99ef1a2ac42125211b2004)
@@ -78,10 +78,10 @@
 				</html:link>
 			</c:otherwise>
 		</c:choose>
-	</p>	
-	
+	</p>
+
 	<c:if test="${mode == 'learner' || mode == 'author'}">
 		<%@ include file="parts/finishButton.jsp"%>
 	</c:if>
-	
+
 </div>
Index: lams_tool_dimdim/web/pages/learning/notebook.jsp
===================================================================
diff -u -r7c68a5b7c9e928e763d087d92d8dd17170f2cb67 -rfe43b12d31adee5cde99ef1a2ac42125211b2004
--- lams_tool_dimdim/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 7c68a5b7c9e928e763d087d92d8dd17170f2cb67)
+++ lams_tool_dimdim/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision fe43b12d31adee5cde99ef1a2ac42125211b2004)
@@ -11,7 +11,8 @@
 		${contentDTO.title}
 	</h1>
 
-	<html:form action="/learning" method="post" onsubmit="disableFinishButton();">
+	<html:form action="/learning" method="post"
+		onsubmit="disableFinishButton();">
 
 		<p class="small-space-top">
 			<lams:out value="${contentDTO.reflectInstructions}" />
Index: lams_tool_dimdim/web/pages/learning/parts/finishButton.jsp
===================================================================
diff -u -r7c68a5b7c9e928e763d087d92d8dd17170f2cb67 -rfe43b12d31adee5cde99ef1a2ac42125211b2004
--- lams_tool_dimdim/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision 7c68a5b7c9e928e763d087d92d8dd17170f2cb67)
+++ lams_tool_dimdim/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision fe43b12d31adee5cde99ef1a2ac42125211b2004)
@@ -15,16 +15,17 @@
 
 	<c:if
 		test="${userDTO.finishedActivity and contentDTO.reflectOnActivity}">
-		
+
 		<div class="space-top">
 			<h2>
 				${contentDTO.reflectInstructions}
 			</h2>
 
-			<p>	
+			<p>
 				<c:choose>
 					<c:when test="${userDTO.notebookEntryDTO != null}">
-						<lams:out escapeHtml="true" value="${userDTO.notebookEntryDTO.entry}" />
+						<lams:out escapeHtml="true"
+							value="${userDTO.notebookEntryDTO.entry}" />
 					</c:when>
 
 					<c:otherwise>
Index: lams_tool_dimdim/web/pages/monitoring/notebook.jsp
===================================================================
diff -u -r7c68a5b7c9e928e763d087d92d8dd17170f2cb67 -rfe43b12d31adee5cde99ef1a2ac42125211b2004
--- lams_tool_dimdim/web/pages/monitoring/notebook.jsp	(.../notebook.jsp)	(revision 7c68a5b7c9e928e763d087d92d8dd17170f2cb67)
+++ lams_tool_dimdim/web/pages/monitoring/notebook.jsp	(.../notebook.jsp)	(revision fe43b12d31adee5cde99ef1a2ac42125211b2004)
@@ -5,7 +5,7 @@
 <div id="content">
 
 	<h1>
-		<fmt:message key="heading.notebookEntry"/> 
+		<fmt:message key="heading.notebookEntry" />
 	</h1>
 
 	<h2>
@@ -14,35 +14,35 @@
 
 	<table>
 		<tr>
-			<td class="field-name" style="width:20%;">
+			<td class="field-name" style="width: 20%;">
 				<fmt:message key="label.created" />
 			</td>
 			<td>
 				<lams:Date value="${userDTO.notebookEntryDTO.createDate }"></lams:Date>
-				
+
 			</td>
 		</tr>
 		<tr>
-			<td class="field-name" style="width:20%;">
+			<td class="field-name" style="width: 20%;">
 				<fmt:message key="label.lastModified" />
 			</td>
 			<td>
 				<lams:Date value="${userDTO.notebookEntryDTO.lastModified }"></lams:Date>
 			</td>
 		</tr>
-	
+
 		<tr>
-			<td class="field-name" style="width:20%;">
+			<td class="field-name" style="width: 20%;">
 				<fmt:message key="label.notebookEntry" />
 			</td>
 			<td>
 				<c:out value="${userDTO.notebookEntryDTO.entry}" escapeXml="false"></c:out>
 			</td>
 		</tr>
 	</table>
-	
+
 	<html:link href="monitoring.do?"></html:link>
-	
+
 </div>
 
 <div id="footer">
Index: lams_tool_dimdim/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r718613f72e0fc64be2db39de3c6c3682852d815b -rfe43b12d31adee5cde99ef1a2ac42125211b2004
--- lams_tool_dimdim/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 718613f72e0fc64be2db39de3c6c3682852d815b)
+++ lams_tool_dimdim/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision fe43b12d31adee5cde99ef1a2ac42125211b2004)
@@ -57,14 +57,14 @@
 	</c:when>
 	<c:otherwise>
 		<h1>
-			<fmt:message key="monitor.summary.dimdimSettings"/>
+			<fmt:message key="monitor.summary.dimdimSettings" />
 		</h1>
 
 		<c:forEach var="session" items="${dto.sessionDTOs}">
 			<html:form action="monitoring" target="_blank">
 				<html:hidden property="dispatch" value="startDimdim" />
 				<html:hidden property="toolSessionID" value="${session.sessionID}" />
-				
+
 				<table>
 					<tr>
 						<td>
@@ -99,12 +99,10 @@
 	</h2>
 
 	<p>
-		<span class="field-name">
-			<fmt:message key="heading.totalLearners" />
-		</span>
-		${session.numberOfLearners}
+		<span class="field-name"> <fmt:message
+				key="heading.totalLearners" /> </span> ${session.numberOfLearners}
 	</p>
-	
+
 	<table cellspacing="0" class="alternative-color">
 
 		<tr>