Index: lams_tool_wiki/web/pages/authoring/basic.jsp
===================================================================
diff -u -r98272e08314f1487800201921390914652849147 -r17bc5f0af3cf849188b294cb7f1fe761f45585ca
--- lams_tool_wiki/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 98272e08314f1487800201921390914652849147)
+++ lams_tool_wiki/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 17bc5f0af3cf849188b294cb7f1fe761f45585ca)
@@ -3,222 +3,198 @@
 
 
 
-<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+<c:set var="formBean"
+	value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 
 <!-- ========== Basic Tab ========== -->
 
 <div id="wikimenu">
 
-	<div id="breadcrumb" style="float: left; width: 30%;">
-		<c:if test="${currentWikiPage.title != mainWikiPage.title}">
-			<a href='javascript:changeWikiPage("${mainWikiPage.javaScriptTitle}")'>/${mainWikiPage.title}</a>
-		</c:if>
-		<a href='javascript:changeWikiPage("${currentWikiPage.javaScriptTitle}")'>/${currentWikiPage.title}</a>
-	</div>
-	
-	<div id="buttons" style="float: right; width: 70%;">
-		<a href="javascript:changeDiv('view');" class="button"><fmt:message key="label.wiki.view"></fmt:message></a>
-		<a href="javascript:changeDiv('edit');" class="button"><fmt:message key="label.wiki.edit"></fmt:message></a>
-		<a href="javascript:cancelAdd();changeDiv('add');" class="button"><fmt:message key="label.wiki.add"></fmt:message></a>
-		<a href="javascript:changeDiv('history');" class="button"><fmt:message key="label.wiki.history"></fmt:message></a>
-		<c:if test="${currentWikiPage.title != mainWikiPage.title}">
-			<a href="javascript:doRemove(&#39;<fmt:message key="label.wiki.remove.confirm"></fmt:message>&#39;)" class="button"><fmt:message key="label.wiki.remove"></fmt:message></a>
-		</c:if>
-		
-	</div>
+<div id="breadcrumb" style="float: left; width: 30%;"><c:if
+	test="${currentWikiPage.title != mainWikiPage.title}">
+	<a href='javascript:changeWikiPage("${mainWikiPage.javaScriptTitle}")'>/${mainWikiPage.title}</a>
+</c:if> <a
+	href='javascript:changeWikiPage("${currentWikiPage.javaScriptTitle}")'>/${currentWikiPage.title}</a>
 </div>
+
+<div id="buttons" style="float: right; width: 70%;"><a
+	href="javascript:changeDiv('view');" class="button"><fmt:message
+	key="label.wiki.view"></fmt:message></a> <a
+	href="javascript:changeDiv('edit');" class="button"><fmt:message
+	key="label.wiki.edit"></fmt:message></a> <a
+	href="javascript:cancelAdd();changeDiv('add');" class="button"><fmt:message
+	key="label.wiki.add"></fmt:message></a> <a
+	href="javascript:changeDiv('history');" class="button"><fmt:message
+	key="label.wiki.history"></fmt:message></a> <c:if
+	test="${currentWikiPage.title != mainWikiPage.title}">
+	<a
+		href="javascript:doRemove(&#39;<fmt:message key="label.wiki.remove.confirm"></fmt:message>&#39;)"
+		class="button"><fmt:message key="label.wiki.remove"></fmt:message></a>
+</c:if></div>
+</div>
 <br />
 <br />
 <hr />
 <br />
 
-<div id="view" >
-	<h1>
-	${currentWikiPage.title}
-	</h1>
-	<br />
-	<i>
-		<fmt:message key="label.wiki.last.edit">
-			<fmt:param>
-				<c:choose>
-					<c:when test="${currentWikiPage.currentWikiContentDTO.editorDTO == null}">
-						<fmt:message key="label.wiki.history.editor.author"></fmt:message>
-					</c:when>
-					<c:otherwise>
+<div id="view">
+<h1>${currentWikiPage.title}</h1>
+<br />
+<i> <fmt:message key="label.wiki.last.edit">
+	<fmt:param>
+		<c:choose>
+			<c:when
+				test="${currentWikiPage.currentWikiContentDTO.editorDTO == null}">
+				<fmt:message key="label.wiki.history.editor.author"></fmt:message>
+			</c:when>
+			<c:otherwise>
 						${currentWikiPage.currentWikiContentDTO.editorDTO.firstName} ${currentWikiPage.currentWikiContentDTO.editorDTO.lastName}
 					</c:otherwise>
-				</c:choose>
-			</fmt:param>			
-			<fmt:param><lams:Date value="${currentWikiPage.currentWikiContentDTO.editDate}" /></fmt:param>
-		</fmt:message>
-	</i>
-	<br />
-	<br />
-	<div id="viewBody">
-	${currentWikiPage.currentWikiContentDTO.body}
-	</div>
+		</c:choose>
+	</fmt:param>
+	<fmt:param>
+		<lams:Date value="${currentWikiPage.currentWikiContentDTO.editDate}" />
+	</fmt:param>
+</fmt:message> </i> <br />
+<br />
+<div id="viewBody">${currentWikiPage.currentWikiContentDTO.body}</div>
 </div>
 
 <div id="history" style="display: none;">
 
-	<h1>
-	<fmt:message key="label.wiki.history" /> - ${currentWikiPage.title}
-	</h1>
-	<br />
-	<c:choose>
+<h1><fmt:message key="label.wiki.history" /> -
+${currentWikiPage.title}</h1>
+<br />
+<c:choose>
 	<c:when test="${not empty wikiPageContentHistory}">
 		<table class="alternative-color">
 			<tr>
-				<th>
-					<fmt:message key="label.wiki.history.version"></fmt:message>
-				</th>	
-				<th>
-					<fmt:message key="label.wiki.history.date"></fmt:message>
+				<th><fmt:message key="label.wiki.history.version"></fmt:message>
 				</th>
-				<th>
-					<fmt:message key="label.wiki.history.editor"></fmt:message>
+				<th><fmt:message key="label.wiki.history.date"></fmt:message></th>
+				<th><fmt:message key="label.wiki.history.editor"></fmt:message>
 				</th>
-				<th>
-					<fmt:message key="label.wiki.history.actions"></fmt:message>
+				<th><fmt:message key="label.wiki.history.actions"></fmt:message>
 				</th>
 			</tr>
-			<c:forEach var="wikiContentPageVersion" items="${wikiPageContentHistory}">
-				<c:if test="${wikiContentPageVersion.version != currentWikiPage.currentWikiContentDTO.version}">
-				<tr>
-					<td>
-						${wikiContentPageVersion.version}
-					</td>
-					<td>
-						<lams:Date value="${wikiContentPageVersion.editDate}" />
-					</td>
-					<td>
-						<c:choose>
+			<c:forEach var="wikiContentPageVersion"
+				items="${wikiPageContentHistory}">
+				<c:if
+					test="${wikiContentPageVersion.version != currentWikiPage.currentWikiContentDTO.version}">
+					<tr>
+						<td>${wikiContentPageVersion.version}</td>
+						<td><lams:Date value="${wikiContentPageVersion.editDate}" />
+						</td>
+						<td><c:choose>
 							<c:when test="${wikiContentPageVersion.editorDTO != null}">
 								${wikiContentPageVersion.editorDTO.firstName} ${wikiContentPageVersion.editorDTO.firstName}
 							</c:when>
 							<c:otherwise>
 								<fmt:message key="label.wiki.history.editor.author"></fmt:message>
 							</c:otherwise>
-						</c:choose>
-					</td>
-					<td>
-						<a href="javascript:doRevert('${wikiContentPageVersion.uid}');" class="button" title='<fmt:message key="label.wiki.history.actions.compare.tooltip" />'>
-							<fmt:message key="label.wiki.history.actions.revert" />
-						</a>
-						&nbsp;
-						<a href="javascript:doCompareOrView('<lams:WebAppURL/>', '${wikiContentPageVersion.uid}', '${currentWikiPage.uid}', 'comparePage');" class="button" title='<fmt:message key="label.wiki.history.actions.compare.tooltip" />'>
-							<fmt:message key="label.wiki.history.actions.compare" />
-						</a>
-						&nbsp;
-						<a href="javascript:doCompareOrView('<lams:WebAppURL/>', '${wikiContentPageVersion.uid}', '${currentWikiPage.uid}', 'viewPage');" class="button" title='<fmt:message key="label.wiki.history.actions.compare.tooltip" />'>
-							<fmt:message key="label.wiki.history.actions.view" />
-						</a>
-					</td>
-				</tr>
+						</c:choose></td>
+						<td><a
+							href="javascript:doRevert('${wikiContentPageVersion.uid}');"
+							title='<fmt:message key="label.wiki.history.actions.compare.tooltip" />'>
+						<fmt:message key="label.wiki.history.actions.revert" /> </a> &nbsp; <a
+							href="javascript:doCompareOrView('<lams:WebAppURL/>', '${wikiContentPageVersion.uid}', '${currentWikiPage.uid}', 'comparePage');"
+							title='<fmt:message key="label.wiki.history.actions.compare.tooltip" />'>
+						<fmt:message key="label.wiki.history.actions.compare" /> </a> &nbsp;
+						<a
+							href="javascript:doCompareOrView('<lams:WebAppURL/>', '${wikiContentPageVersion.uid}', '${currentWikiPage.uid}', 'viewPage');"
+							title='<fmt:message key="label.wiki.history.actions.compare.tooltip" />'>
+						<fmt:message key="label.wiki.history.actions.view" /> </a></td>
+					</tr>
 				</c:if>
 			</c:forEach>
 		</table>
 	</c:when>
 	<c:otherwise>
 		<fmt:message key="label.wiki.history.empty" />
 	</c:otherwise>
-	</c:choose>
-</div>
+</c:choose></div>
 
 
-<div id="edit" style="display:none;"  >
-	<h1>
-		<fmt:message key="label.wiki.edit"></fmt:message> - ${currentWikiPage.title}
-	</h1>
-	<table cellpadding="0">
-		<tr>
-			<td>
-				<div class="field-name">
-					<fmt:message key="label.authoring.basic.title"></fmt:message>
-				</div>
-				<html:text property="title" styleId="title" style="width: 99%;" value="${currentWikiPage.title}"></html:text>
-			</td>
-		</tr>
-		<tr>
-			<td>
-				<div class="field-name">
-					<fmt:message key="label.wiki.body"></fmt:message>
-				</div>
-				<lams:FCKEditor id="wikiBody"
-					value="${currentWikiPage.currentWikiContentDTO.body}"
-					contentFolderID="${sessionMap.contentFolderID}"
-					toolbarSet="Custom-Learner"
-					height="400px"
-					>
-				</lams:FCKEditor>
-			</td>
-		</tr>
-		<tr>
-			<td>
-				<html:checkbox property="isEditable" value="1" styleClass="noBorder" styleId="isEditable"></html:checkbox>&nbsp;<fmt:message key="label.authoring.basic.wikipagevisible"></fmt:message>
-			</td>
-		</tr>
-		<tr>
-			<td align="right">
-				<a href="javascript:doEditOrAdd('editPage');" class="button"><fmt:message key="label.wiki.savechanges"></fmt:message></a>	
-				<a href="javascript:changeDiv('view');" class="button"><fmt:message key="button.cancel"></fmt:message></a>
-			</td>
-		</tr>
-	</table>
+<div id="edit" style="display: none;">
+<h1><fmt:message key="label.wiki.edit"></fmt:message> -
+${currentWikiPage.title}</h1>
+<table cellpadding="0">
+	<tr>
+		<td>
+		<div class="field-name"><fmt:message
+			key="label.authoring.basic.title"></fmt:message></div>
+		<html:text property="title" styleId="title" style="width: 99%;"
+			value="${currentWikiPage.title}"></html:text></td>
+	</tr>
+	<tr>
+		<td>
+		<div class="field-name"><fmt:message key="label.wiki.body"></fmt:message>
+		</div>
+		<lams:FCKEditor id="wikiBody"
+			value="${currentWikiPage.currentWikiContentDTO.body}"
+			contentFolderID="${sessionMap.contentFolderID}"
+			toolbarSet="Custom-Learner" height="400px">
+		</lams:FCKEditor></td>
+	</tr>
+	<tr>
+		<td><html:checkbox property="isEditable" value="1"
+			styleClass="noBorder" styleId="isEditable"></html:checkbox>&nbsp;<fmt:message
+			key="label.authoring.basic.wikipagevisible"></fmt:message></td>
+	</tr>
+	<tr>
+		<td align="right"><a href="javascript:doEditOrAdd('editPage');"
+			class="button"><fmt:message key="label.wiki.savechanges"></fmt:message></a>
+		<a href="javascript:changeDiv('view');" class="button"><fmt:message
+			key="button.cancel"></fmt:message></a></td>
+	</tr>
+</table>
 </div>
 
-<div id="add" style="display:none;"  >
+<div id="add" style="display: none;">
 
-	<h1><fmt:message key="label.wiki.add"></fmt:message></h1>
-	<table cellpadding="0">
-		<tr>
-			<td>
-				<div class="field-name">
-					<fmt:message key="label.authoring.basic.title"></fmt:message>
-				</div>
-				<html:text property="newPageTitle" styleId="newPageTitle" style="width: 99%;" value=""></html:text>
-			</td>
-		</tr>
-		<tr>
-			<td>
-				<div class="field-name">
-					<fmt:message key="label.wiki.body"></fmt:message>
-				</div>
-				<lams:FCKEditor id="newPageWikiBody"
-					value=""
-					height="400px"
-					contentFolderID="${sessionMap.contentFolderID}"
-					toolbarSet="Custom-Learner"></lams:FCKEditor>
-			</td>
-		</tr>
-		<tr>
-			<td>
-				<html:checkbox property="newPageIsEditable"  styleClass="noBorder" value="1" styleId="newPageIsEditable"></html:checkbox>&nbsp;<fmt:message key="label.authoring.basic.wikipagevisible"></fmt:message>
-			</td>
-		</tr>
-		<tr>
-			<td align="right">
-				<a href="javascript:doEditOrAdd('addPage');" class="button"><fmt:message key="label.wiki.savechanges"></fmt:message></a>	
-				<a href="javascript:cancelAdd();changeDiv('view');" class="button"><fmt:message key="button.cancel"></fmt:message></a>
-			</td>
-		</tr>
-	</table>
+<h1><fmt:message key="label.wiki.add"></fmt:message></h1>
+<table cellpadding="0">
+	<tr>
+		<td>
+		<div class="field-name"><fmt:message
+			key="label.authoring.basic.title"></fmt:message></div>
+		<html:text property="newPageTitle" styleId="newPageTitle"
+			style="width: 99%;" value=""></html:text></td>
+	</tr>
+	<tr>
+		<td>
+		<div class="field-name"><fmt:message key="label.wiki.body"></fmt:message>
+		</div>
+		<lams:FCKEditor id="newPageWikiBody" value="" height="400px"
+			contentFolderID="${sessionMap.contentFolderID}"
+			toolbarSet="Custom-Learner"></lams:FCKEditor></td>
+	</tr>
+	<tr>
+		<td><html:checkbox property="newPageIsEditable"
+			styleClass="noBorder" value="1" styleId="newPageIsEditable"></html:checkbox>&nbsp;<fmt:message
+			key="label.authoring.basic.wikipagevisible"></fmt:message></td>
+	</tr>
+	<tr>
+		<td align="right"><a href="javascript:doEditOrAdd('addPage');"
+			class="button"><fmt:message key="label.wiki.savechanges"></fmt:message></a>
+		<a href="javascript:cancelAdd();changeDiv('view');" class="button"><fmt:message
+			key="button.cancel"></fmt:message></a></td>
+	</tr>
+</table>
 </div>
 
 <br />
 <hr />
 <br />
 
-<div class="field-name">
-	<fmt:message key="label.wiki.pages"></fmt:message>
+<div class="field-name"><fmt:message key="label.wiki.pages"></fmt:message>
 </div>
 <c:forEach var="wikiPage" items="${wikiPages}">
 	<a href="javascript:changeWikiPage('${wikiPage.javaScriptTitle}')">
-		${wikiPage.title}
-		<c:if test="${wikiPage.title == mainWikiPage.title}">
-			<fmt:message key="label.wiki.main"></fmt:message>
-		</c:if>
-	</a><br />
+	${wikiPage.title} <c:if test="${wikiPage.title == mainWikiPage.title}">
+		<fmt:message key="label.wiki.main"></fmt:message>
+	</c:if> </a>
+	<br />
 </c:forEach>
 
 <script type="text/javascript">
Index: lams_tool_wiki/web/pages/learning/wiki.jsp
===================================================================
diff -u -ra5bf36d6e7324507406e5dfa59d4d75ef29fff6e -r17bc5f0af3cf849188b294cb7f1fe761f45585ca
--- lams_tool_wiki/web/pages/learning/wiki.jsp	(.../wiki.jsp)	(revision a5bf36d6e7324507406e5dfa59d4d75ef29fff6e)
+++ lams_tool_wiki/web/pages/learning/wiki.jsp	(.../wiki.jsp)	(revision 17bc5f0af3cf849188b294cb7f1fe761f45585ca)
@@ -42,293 +42,265 @@
 </script>
 
 
-<div id="content">
-	<!-- Display the advanced option warnings -->
-	<div class="info" id="messageDiv" style="display:none;">
-		<c:if test="${wikiDTO.lockOnFinish and mode == 'learner'}">
-				<p>
-				<c:choose>
-					<c:when test="${finishedActivity}">
-						<fmt:message key="message.activityLocked" />
+<div id="content"><!-- Display the advanced option warnings -->
+<div class="info" id="messageDiv" style="display: none;"><c:if
+	test="${wikiDTO.lockOnFinish and mode == 'learner'}">
+	<p><c:choose>
+		<c:when test="${finishedActivity}">
+			<fmt:message key="message.activityLocked" />
+		</c:when>
+		<c:otherwise>
+			<fmt:message key="message.warnLockOnFinish" />
+		</c:otherwise>
+	</c:choose></p>
+</c:if> <c:if test="${not (wikiDTO.lockOnFinish and finishedActivity) }">
+	<c:choose>
+		<c:when test="${currentWikiPage.editable}">
+			<c:if test="${not minEditsReached}">
+				<p><fmt:message key="message.minumumEditsNotReached">
+					<fmt:param>
+								${wikiDTO.minimumEdits}
+							</fmt:param>
+				</fmt:message></p>
+			</c:if>
+
+			<c:if test="${wikiDTO.maximumEdits > 0}">
+				<p><c:choose>
+					<c:when test="${maxEditsReached}">
+						<fmt:message key="message.maxEditsReached" />
 					</c:when>
 					<c:otherwise>
-						<fmt:message key="message.warnLockOnFinish" />
-					</c:otherwise>
-				</c:choose>
-				</p>
-		</c:if>
-		
-		<c:if test="${not (wikiDTO.lockOnFinish and finishedActivity) }">
-			<c:choose>
-				<c:when test="${currentWikiPage.editable}">
-					<c:if test="${not minEditsReached}">
-						<p>
-						<fmt:message key="message.minumumEditsNotReached">
+						<fmt:message key="message.warnMaxEdits">
 							<fmt:param>
-								${wikiDTO.minimumEdits}
-							</fmt:param>
-						</fmt:message>
-						</p>
-					</c:if>
-					
-					<c:if test="${wikiDTO.maximumEdits > 0}">
-						<p>
-							<c:choose>
-								<c:when test="${maxEditsReached}">
-									<fmt:message key="message.maxEditsReached" />
-								</c:when>
-								<c:otherwise>
-									<fmt:message key="message.warnMaxEdits" >
-										<fmt:param>
 										${editsLeft} 
 										</fmt:param>
-									</fmt:message>
-								</c:otherwise>
-							</c:choose>
-						</p>
-					</c:if>
-				</c:when>
-				<c:otherwise>
-					<p>		
-						<fmt:message key="message.pageNotEditable" />
-					</p>
-				</c:otherwise>
-			</c:choose>
+						</fmt:message>
+					</c:otherwise>
+				</c:choose></p>
+			</c:if>
+		</c:when>
+		<c:otherwise>
+			<p><fmt:message key="message.pageNotEditable" /></p>
+		</c:otherwise>
+	</c:choose>
+</c:if></div>
+
+&nbsp; <html:form action="/learning" method="post"
+	styleId="learningForm" enctype="multipart/form-data">
+	<html:hidden property="dispatch" styleId="dispatch"
+		value="finishActivity" />
+	<html:hidden property="toolSessionID" />
+	<html:hidden property="mode" />
+	<html:hidden property="currentWikiPage" value="${currentWikiPage.uid}"
+		styleId="currentWikiPage" />
+	<input type="hidden" id="wikiLinks" />
+	<html:hidden property="newPageName" styleId="newPageName" />
+	<html:hidden property="historyPageContentId"
+		styleId="historyPageContentId" />
+	<c:set var="lrnForm"
+		value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+
+	<!-- Set up edit and add flags -->
+	<c:set var="editableFlag"
+		value="${currentWikiPage.editable and not maxEditsReached}" />
+	<c:set var="addFlag"
+		value="${wikiDTO.allowLearnerCreatePages and not maxEditsReached}" />
+
+
+	<div id="wikimenu">
+	<div id="breadcrumb" style="float: left; width: 30%;"><c:if
+		test="${currentWikiPage.title != mainWikiPage.title}">
+		<a href="javascript:changeWikiPage('${mainWikiPage.javaScriptTitle}')">/${mainWikiPage.title}</a>
+	</c:if> <a
+		href="javascript:changeWikiPage('${currentWikiPage.javaScriptTitle}')">/${currentWikiPage.title}</a>
+	</div>
+
+	<div id="buttons" style="float: right; width: 70%;"><c:if
+		test="${contentEditable}">
+		<c:if test="${editableFlag or addFlag}">
+			<a href="javascript:changeDiv('view');" class="button"><fmt:message
+				key="label.wiki.view"></fmt:message></a>
 		</c:if>
+		<c:if test="${editableFlag}">
+			<a href="javascript:changeDiv('edit');" class="button"><fmt:message
+				key="label.wiki.edit"></fmt:message></a>
+		</c:if>
+		<c:if test="${addFlag}">
+			<a href="javascript:cancelAdd();changeDiv('add');" class="button"><fmt:message
+				key="label.wiki.add"></fmt:message></a>
+		</c:if>
+		<c:if test="${editableFlag}">
+			<a href="javascript:changeDiv('history');" class="button"><fmt:message
+				key="label.wiki.history"></fmt:message></a>
+		</c:if>
+		<c:if
+			test="${currentWikiPage.title != mainWikiPage.title && editableFlag}">
+			<a
+				href="javascript:doRemove(&#39;<fmt:message key="label.wiki.remove.confirm"></fmt:message>&#39;)"
+				class="button"><fmt:message key="label.wiki.remove"></fmt:message></a>
+		</c:if>
+	</c:if></div>
 	</div>
 
-	&nbsp;
+	<br />
+	<br />
+	<hr />
+	<br />
 
-	<html:form action="/learning" method="post" styleId="learningForm" enctype="multipart/form-data">
-		<html:hidden property="dispatch" styleId="dispatch" value="finishActivity" />
-		<html:hidden property="toolSessionID" />
-		<html:hidden property="mode" />
-		<html:hidden property="currentWikiPage" value="${currentWikiPage.uid}" styleId="currentWikiPage" />
-		<input type="hidden" id="wikiLinks"/>
-		<html:hidden property="newPageName" styleId="newPageName"/>
-		<html:hidden property="historyPageContentId" styleId="historyPageContentId"/>
-		<c:set var="lrnForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-		
-		<!-- Set up edit and add flags -->
-		<c:set var="editableFlag" value="${currentWikiPage.editable and not maxEditsReached}" />
-		<c:set var="addFlag" value="${wikiDTO.allowLearnerCreatePages and not maxEditsReached}" />
-		
-		
-		<div id="wikimenu">
-			<div id="breadcrumb" style="float: left; width: 30%;">
-				<c:if test="${currentWikiPage.title != mainWikiPage.title}">
-					<a href="javascript:changeWikiPage('${mainWikiPage.javaScriptTitle}')">/${mainWikiPage.title}</a>
-				</c:if>
-				<a href="javascript:changeWikiPage('${currentWikiPage.javaScriptTitle}')">/${currentWikiPage.title}</a>
-			</div>
-			
-			<div id="buttons" style="float: right; width: 70%;">
-			
-				<c:if test="${contentEditable}">
-					<c:if test="${editableFlag or addFlag}">	
-						<a href="javascript:changeDiv('view');" class="button"><fmt:message key="label.wiki.view"></fmt:message></a>
-					</c:if>
-					<c:if test="${editableFlag}">	
-						<a href="javascript:changeDiv('edit');" class="button"><fmt:message key="label.wiki.edit"></fmt:message></a>
-					</c:if>
-					<c:if test="${addFlag}">
-						<a href="javascript:cancelAdd();changeDiv('add');" class="button"><fmt:message key="label.wiki.add"></fmt:message></a>
-					</c:if>
-					<c:if test="${editableFlag}">
-						<a href="javascript:changeDiv('history');" class="button"><fmt:message key="label.wiki.history"></fmt:message></a>
-					</c:if>
-					<c:if test="${currentWikiPage.title != mainWikiPage.title && editableFlag}">
-						<a href="javascript:doRemove(&#39;<fmt:message key="label.wiki.remove.confirm"></fmt:message>&#39;)" class="button"><fmt:message key="label.wiki.remove"></fmt:message></a>
-					</c:if>
-				</c:if>
-			</div>
-		</div>
-		
-		<br />
-		<br />
-		<hr />
-		<br />
-		
-		<div id="view" >
-			<h1>
-			${currentWikiPage.title}
-			</h1>
-			<i>
-				<fmt:message key="label.wiki.last.edit">
-					<fmt:param>
-						<c:choose>
-							<c:when test="${currentWikiPage.currentWikiContentDTO.editorDTO == null}">
-								<fmt:message key="label.wiki.history.editor.author"></fmt:message>
-							</c:when>
-							<c:otherwise>
+	<div id="view">
+	<h1>${currentWikiPage.title}</h1>
+	<i> <fmt:message key="label.wiki.last.edit">
+		<fmt:param>
+			<c:choose>
+				<c:when
+					test="${currentWikiPage.currentWikiContentDTO.editorDTO == null}">
+					<fmt:message key="label.wiki.history.editor.author"></fmt:message>
+				</c:when>
+				<c:otherwise>
 								${currentWikiPage.currentWikiContentDTO.editorDTO.firstName} ${currentWikiPage.currentWikiContentDTO.editorDTO.lastName}
 							</c:otherwise>
-						</c:choose>
-					</fmt:param>
-					<fmt:param><lams:Date value="${currentWikiPage.currentWikiContentDTO.editDate}" /></fmt:param>
-				</fmt:message>
-			</i>
-			<br />
-			<br />
-			<div id="viewBody">
-			${currentWikiPage.currentWikiContentDTO.body}
-			</div>
-		</div>
-			
-		<div id="history" style="display: none;">
-			<h1>
-			<fmt:message key="label.wiki.history" /> - ${currentWikiPage.title}
-			</h1>
-			<br />
-			<c:choose>
-			<c:when test="${not empty wikiPageContentHistory}">
-				<table class="alternative-color">
-					<tr>
-						<th>
-							<fmt:message key="label.wiki.history.version"></fmt:message>
-						</th>	
-						<th>
-							<fmt:message key="label.wiki.history.date"></fmt:message>
-						</th>
-						<th>
-							<fmt:message key="label.wiki.history.editor"></fmt:message>
-						</th>
-						<th>
-							<fmt:message key="label.wiki.history.actions"></fmt:message>
-						</th>
-					</tr>
-					<c:forEach var="wikiContentPageVersion" items="${wikiPageContentHistory}">
-						<c:if test="${wikiContentPageVersion.version != currentWikiPage.currentWikiContentDTO.version}">
+			</c:choose>
+		</fmt:param>
+		<fmt:param>
+			<lams:Date value="${currentWikiPage.currentWikiContentDTO.editDate}" />
+		</fmt:param>
+	</fmt:message> </i> <br />
+	<br />
+	<div id="viewBody">${currentWikiPage.currentWikiContentDTO.body}
+	</div>
+	</div>
+
+	<div id="history" style="display: none;">
+	<h1><fmt:message key="label.wiki.history" /> -
+	${currentWikiPage.title}</h1>
+	<br />
+	<c:choose>
+		<c:when test="${not empty wikiPageContentHistory}">
+			<table class="alternative-color">
+				<tr>
+					<th><fmt:message key="label.wiki.history.version"></fmt:message>
+					</th>
+					<th><fmt:message key="label.wiki.history.date"></fmt:message>
+					</th>
+					<th><fmt:message key="label.wiki.history.editor"></fmt:message>
+					</th>
+					<th><fmt:message key="label.wiki.history.actions"></fmt:message>
+					</th>
+				</tr>
+				<c:forEach var="wikiContentPageVersion"
+					items="${wikiPageContentHistory}">
+					<c:if
+						test="${wikiContentPageVersion.version != currentWikiPage.currentWikiContentDTO.version}">
 						<tr>
-							<td>
-								${wikiContentPageVersion.version}
+							<td>${wikiContentPageVersion.version}</td>
+							<td><lams:Date value="${wikiContentPageVersion.editDate}" />
 							</td>
-							<td>
-								<lams:Date value="${wikiContentPageVersion.editDate}" />
-							</td>
-							<td>
-								<c:choose>
-									<c:when test="${wikiContentPageVersion.editorDTO != null}">
+							<td><c:choose>
+								<c:when test="${wikiContentPageVersion.editorDTO != null}">
 										${wikiContentPageVersion.editorDTO.firstName} ${wikiContentPageVersion.editorDTO.firstName}
 									</c:when>
-									<c:otherwise>
-										<fmt:message key="label.wiki.history.editor.author"></fmt:message>
-									</c:otherwise>
-								</c:choose>
-							</td>
-							<td>
-								<a href="javascript:doRevert('${wikiContentPageVersion.uid}');" class="button" title='<fmt:message key="label.wiki.history.actions.compare.tooltip" />'>
-									<fmt:message key="label.wiki.history.actions.revert" />
-								</a>
-								&nbsp;
-								<a href="javascript:doCompareOrView('<lams:WebAppURL/>', '${wikiContentPageVersion.uid}', '${currentWikiPage.uid}', 'comparePage');" class="button" title='<fmt:message key="label.wiki.history.actions.compare.tooltip" />'>
-									<fmt:message key="label.wiki.history.actions.compare" />
-								</a>
-								&nbsp;
-								<a href="javascript:doCompareOrView('<lams:WebAppURL/>', '${wikiContentPageVersion.uid}', '${currentWikiPage.uid}', 'viewPage');" class="button" title='<fmt:message key="label.wiki.history.actions.compare.tooltip" />'>
-									<fmt:message key="label.wiki.history.actions.view" />
-								</a>
-							</td>
+								<c:otherwise>
+									<fmt:message key="label.wiki.history.editor.author"></fmt:message>
+								</c:otherwise>
+							</c:choose></td>
+							<td><a
+								href="javascript:doRevert('${wikiContentPageVersion.uid}');"
+								title='<fmt:message key="label.wiki.history.actions.compare.tooltip" />'>
+							<fmt:message key="label.wiki.history.actions.revert" /> </a> &nbsp;
+							<a
+								href="javascript:doCompareOrView('<lams:WebAppURL/>', '${wikiContentPageVersion.uid}', '${currentWikiPage.uid}', 'comparePage');"
+								title='<fmt:message key="label.wiki.history.actions.compare.tooltip" />'>
+							<fmt:message key="label.wiki.history.actions.compare" /> </a> &nbsp;
+							<a
+								href="javascript:doCompareOrView('<lams:WebAppURL/>', '${wikiContentPageVersion.uid}', '${currentWikiPage.uid}', 'viewPage');"
+								title='<fmt:message key="label.wiki.history.actions.compare.tooltip" />'>
+							<fmt:message key="label.wiki.history.actions.view" /> </a></td>
 						</tr>
-						</c:if>
-					</c:forEach>
-				</table>
-			</c:when>
-			<c:otherwise>
-				<fmt:message key="label.wiki.history.empty" />
-			</c:otherwise>
-			</c:choose>
-		</div>
-		
-		
-		<div id="edit" style="display:none;"  >
-			<h1>
-				<fmt:message key="label.wiki.edit"></fmt:message> - ${currentWikiPage.title}
-			</h1>
-			<table cellpadding="0">
-				<tr>
-					<td>
-						<div class="field-name">
-							<fmt:message key="label.authoring.basic.title"></fmt:message>
-						</div>
-						<html:text property="title" styleId="title" style="width: 99%;" value="${currentWikiPage.title}"></html:text>
-					</td>
-				</tr>
-				<tr>
-					<td>
-						<div class="field-name">
-							<fmt:message key="label.wiki.body"></fmt:message>
-						</div>
-						<lams:FCKEditor id="wikiBody"
-							value="${currentWikiPage.currentWikiContentDTO.body}"
-							contentFolderID="${contentFolderID}"
-							toolbarSet="Custom-Learner"
-							height="400px"
-							>
-						</lams:FCKEditor>
-					</td>
-				</tr>
-				<tr>
-					<td align="right">
-						<br />
-						<a href="javascript:doEditOrAdd('editPage');" class="button"><fmt:message key="label.wiki.savechanges"></fmt:message></a>	
-						<a href="javascript:changeDiv('view');" class="button"><fmt:message key="button.cancel"></fmt:message></a>
-					</td>
-				</tr>
+					</c:if>
+				</c:forEach>
 			</table>
-		</div>
+		</c:when>
+		<c:otherwise>
+			<fmt:message key="label.wiki.history.empty" />
+		</c:otherwise>
+	</c:choose></div>
 
-		<div id="add" style="display:none;"  >
-			<h1><fmt:message key="label.wiki.add"></fmt:message></h1>
-			<table cellpadding="0">
-				<tr>
-					<td>
-						<div class="field-name">
-							<fmt:message key="label.authoring.basic.title"></fmt:message>
-						</div>
-						<html:text property="newPageTitle" styleId="newPageTitle" style="width: 99%;" value=""></html:text>
-					</td>
-				</tr>
-				<tr>
-					<td>
-						<div class="field-name">
-							<fmt:message key="label.wiki.body"></fmt:message>
-						</div>
-						<lams:FCKEditor id="newPageWikiBody"
-							value=""
-							height="400px"
-							contentFolderID="${contentFolderID}"
-							toolbarSet="Custom-Learner"></lams:FCKEditor>
-					</td>
-				</tr>
-				<tr>
-					<td align="right">
-						<br />
-						<a href="javascript:doEditOrAdd('addPage');" class="button"><fmt:message key="label.wiki.savechanges"></fmt:message></a>	
-						<a href="javascript:cancelAdd();changeDiv('view');" class="button"><fmt:message key="button.cancel"></fmt:message></a>
-					</td>
-				</tr>
-			</table>
-		</div>
-		
+
+	<div id="edit" style="display: none;">
+	<h1><fmt:message key="label.wiki.edit"></fmt:message> -
+	${currentWikiPage.title}</h1>
+	<table cellpadding="0">
+		<tr>
+			<td>
+			<div class="field-name"><fmt:message
+				key="label.authoring.basic.title"></fmt:message></div>
+			<html:text property="title" styleId="title" style="width: 99%;"
+				value="${currentWikiPage.title}"></html:text></td>
+		</tr>
+		<tr>
+			<td>
+			<div class="field-name"><fmt:message key="label.wiki.body"></fmt:message>
+			</div>
+			<lams:FCKEditor id="wikiBody"
+				value="${currentWikiPage.currentWikiContentDTO.body}"
+				contentFolderID="${contentFolderID}" toolbarSet="Custom-Learner"
+				height="400px">
+			</lams:FCKEditor></td>
+		</tr>
+		<tr>
+			<td align="right"><br />
+			<a href="javascript:doEditOrAdd('editPage');" class="button"><fmt:message
+				key="label.wiki.savechanges"></fmt:message></a> <a
+				href="javascript:changeDiv('view');" class="button"><fmt:message
+				key="button.cancel"></fmt:message></a></td>
+		</tr>
+	</table>
+	</div>
+
+	<div id="add" style="display: none;">
+	<h1><fmt:message key="label.wiki.add"></fmt:message></h1>
+	<table cellpadding="0">
+		<tr>
+			<td>
+			<div class="field-name"><fmt:message
+				key="label.authoring.basic.title"></fmt:message></div>
+			<html:text property="newPageTitle" styleId="newPageTitle"
+				style="width: 99%;" value=""></html:text></td>
+		</tr>
+		<tr>
+			<td>
+			<div class="field-name"><fmt:message key="label.wiki.body"></fmt:message>
+			</div>
+			<lams:FCKEditor id="newPageWikiBody" value="" height="400px"
+				contentFolderID="${contentFolderID}" toolbarSet="Custom-Learner"></lams:FCKEditor>
+			</td>
+		</tr>
+		<tr>
+			<td align="right"><br />
+			<a href="javascript:doEditOrAdd('addPage');" class="button"><fmt:message
+				key="label.wiki.savechanges"></fmt:message></a> <a
+				href="javascript:cancelAdd();changeDiv('view');" class="button"><fmt:message
+				key="button.cancel"></fmt:message></a></td>
+		</tr>
+	</table>
+	</div>
+
+	<br />
+	<hr />
+	<br />
+
+
+	<div class="field-name"><fmt:message key="label.wiki.pages"></fmt:message>
+	</div>
+	<c:forEach var="wikiPage" items="${wikiPages}">
+		<a href="javascript:changeWikiPage('${wikiPage.javaScriptTitle}')">
+		${wikiPage.title} <c:if test="${wikiPage.title == mainWikiPage.title}">
+			<fmt:message key="label.wiki.main"></fmt:message>
+		</c:if> </a>
 		<br />
-		<hr />
-		<br />
-		
-		
-		<div class="field-name">
-			<fmt:message key="label.wiki.pages"></fmt:message>
-		</div>
-		<c:forEach var="wikiPage" items="${wikiPages}">
-			<a href="javascript:changeWikiPage('${wikiPage.javaScriptTitle}')">
-				${wikiPage.title}
-				<c:if test="${wikiPage.title == mainWikiPage.title}">
-					<fmt:message key="label.wiki.main"></fmt:message>
-				</c:if>
-			</a><br />
-		</c:forEach>
+	</c:forEach>
 
-		<!-- 
+	<!-- 
 		<div id="finishButtonDiv">
 			
 			<c:choose>
@@ -343,13 +315,9 @@
 			
 		</div>
 		-->
-	</html:form>
-			
-	<c:if test="${mode == 'learner' || mode == 'author'}">
-		<%@ include file="parts/finishButton.jsp"%>
-	</c:if>
-	
-</div>
+</html:form> <c:if test="${mode == 'learner' || mode == 'author'}">
+	<%@ include file="parts/finishButton.jsp"%>
+</c:if></div>
 
 <script type="text/javascript">
 <!--
@@ -419,5 +387,21 @@
 		document.getElementById("dispatch").value=dispatch;
 		document.getElementById("learningForm").submit();
 	}
+	
+	function hideToolbarItem(editorInstance, itemName) {
+		toolbarItem = editorInstance.EditorWindow.parent.FCKToolbarItems.LoadedItems[itemName]._UIButton.MainElement;
+		toolbarItem.style.display = 'none';
+	}
+	
+	function FCKeditor_OnComplete(editorInstance) 
+	{ 	
+		if (!${wikiDTO.allowLearnerAttachImages}) {	
+			hideToolbarItem(editorInstance, 'Image');
+		}
+		if (!${wikiDTO.allowLearnerInsertLinks}) {	
+			hideToolbarItem(editorInstance, 'Link');
+		}
+	}
+
 -->
 </script>
Index: lams_tool_wiki/web/pages/monitoring/wikiDisplay.jsp
===================================================================
diff -u -ra5bf36d6e7324507406e5dfa59d4d75ef29fff6e -r17bc5f0af3cf849188b294cb7f1fe761f45585ca
--- lams_tool_wiki/web/pages/monitoring/wikiDisplay.jsp	(.../wikiDisplay.jsp)	(revision a5bf36d6e7324507406e5dfa59d4d75ef29fff6e)
+++ lams_tool_wiki/web/pages/monitoring/wikiDisplay.jsp	(.../wikiDisplay.jsp)	(revision 17bc5f0af3cf849188b294cb7f1fe761f45585ca)
@@ -25,7 +25,8 @@
 	<div id="breadcrumb" style="float: left; width: 30%;"><c:if
 		test="${currentWikiPage.title != mainWikiPage.title}">
 		<a href="javascript:changeWikiPage('${mainWikiPage.javaScriptTitle}')">/${mainWikiPage.title}</a>
-	</c:if> <a href="javascript:changeWikiPage('${currentWikiPage.javaScriptTitle}')">/${currentWikiPage.title}</a>
+	</c:if> <a
+		href="javascript:changeWikiPage('${currentWikiPage.javaScriptTitle}')">/${currentWikiPage.title}</a>
 	</div>
 
 	<div id="buttons" style="float: right; width: 70%;"><a
@@ -110,17 +111,14 @@
 							</c:choose></td>
 							<td><a
 								href="javascript:doRevert('${wikiContentPageVersion.uid}');"
-								class="button"
 								title='<fmt:message key="label.wiki.history.actions.compare.tooltip" />'>
 							<fmt:message key="label.wiki.history.actions.revert" /> </a> &nbsp;
 							<a
 								href="javascript:doCompareOrView('<lams:WebAppURL/>', '${wikiContentPageVersion.uid}', '${currentWikiPage.uid}', 'comparePage');"
-								class="button"
 								title='<fmt:message key="label.wiki.history.actions.compare.tooltip" />'>
 							<fmt:message key="label.wiki.history.actions.compare" /> </a> &nbsp;
 							<a
 								href="javascript:doCompareOrView('<lams:WebAppURL/>', '${wikiContentPageVersion.uid}', '${currentWikiPage.uid}', 'viewPage');"
-								class="button"
 								title='<fmt:message key="label.wiki.history.actions.compare.tooltip" />'>
 							<fmt:message key="label.wiki.history.actions.view" /> </a></td>
 						</tr>
@@ -150,8 +148,8 @@
 			</div>
 			<lams:FCKEditor id="wikiBody"
 				value="${currentWikiPage.currentWikiContentDTO.body}"
-				contentFolderID="${contentFolderID}"
-				toolbarSet="Custom-Learner" height="400px">
+				contentFolderID="${contentFolderID}" toolbarSet="Custom-Learner"
+				height="400px">
 			</lams:FCKEditor></td>
 		</tr>
 		<tr>
@@ -184,8 +182,7 @@
 			<div class="field-name"><fmt:message key="label.wiki.body"></fmt:message>
 			</div>
 			<lams:FCKEditor id="newPageWikiBody" value="" height="400px"
-				contentFolderID="${contentFolderID}"
-				toolbarSet="Custom-Learner"></lams:FCKEditor></td>
+				contentFolderID="${contentFolderID}" toolbarSet="Custom-Learner"></lams:FCKEditor></td>
 		</tr>
 		<tr>
 			<td><html:checkbox property="newPageIsEditable"
@@ -216,27 +213,23 @@
 	</c:forEach>
 
 	<!-- Reflections -->
-	<c:if test="${not empty sessionDTO.userDTOs && sessionDTO.reflectOnActivity}">
-		
+	<c:if
+		test="${not empty sessionDTO.userDTOs && sessionDTO.reflectOnActivity}">
+
 		<br />
 		<hr />
 		<br />
-		
-		<h4>
-			<fmt:message key="monitor.notebooks"></fmt:message>
-		</h4>
+
+		<h4><fmt:message key="monitor.notebooks"></fmt:message></h4>
 		<br />
 		<table class="alternative-color">
 			<c:forEach var="user" items="${sessionDTO.userDTOs}">
 				<c:if test="${not empty user.notebookEntry}">
-				<tr>
-					<td>
-						${user.firstName} ${user.lastName}
-					</td>
-					<td> 
-						<lams:out escapeHtml="true" value="${user.notebookEntry}" />
-					</td>
-				</tr>
+					<tr>
+						<td>${user.firstName} ${user.lastName}</td>
+						<td><lams:out escapeHtml="true" value="${user.notebookEntry}" />
+						</td>
+					</tr>
 				</c:if>
 			</c:forEach>
 		</table>