Index: lams_tool_wiki/web/WEB-INF/tags/Alert.tag
===================================================================
diff -u
--- lams_tool_wiki/web/WEB-INF/tags/Alert.tag	(revision 0)
+++ lams_tool_wiki/web/WEB-INF/tags/Alert.tag	(revision 49e5b8d736ebbedef20c3f3f96f4f18979b864d1)
@@ -0,0 +1,46 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+
+<%@ attribute name="close" required="false" rtexprvalue="true"%>
+<%@ attribute name="id" required="false" rtexprvalue="true"%>
+<%@ attribute name="type" required="false" rtexprvalue="true"%>
+
+<c:set var="idName" value="alert-${type}" />
+<c:if test="${not empty id}">
+	<c:set var="idName" value="${id}" />
+</c:if>
+
+<c:set var="alertType" value="info" />
+<c:set var="iconType" value="info-circle" />
+<c:choose>
+	<c:when test="${type == 'danger'}">
+		<c:set var="alertType" value="danger" />
+		<c:set var="iconType" value="times-circle" />
+	</c:when>
+	<c:when test="${type == 'success'}">
+		<c:set var="alertType" value="success" />
+		<c:set var="iconType" value="check-circle" />
+	</c:when>
+	<c:when test="${type == 'warning'}">
+		<c:set var="alertType" value="warning" />
+		<c:set var="iconType" value="exclamation-circle" />
+	</c:when>
+</c:choose>
+
+<div class="row no-gutter">
+	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
+		<div id="${idName}" class="alert alert-${alertType}" style="margin-bottom: 10px; padding: 8px">
+			<div class="media">
+				<div class="media-left">
+					<i class="fa fa-lg fa-${iconType} text-muted"></i>
+				</div>
+				<div class="media-body">
+					<c:if test="${close}">
+							<a href="#" class="close pull-right" data-dismiss="alert" aria-label="close">&times;</a>
+					</c:if>
+					<jsp:doBody />
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
Index: lams_tool_wiki/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -r1082bdcc357c105126a5641cecc68acfa645b66b -r49e5b8d736ebbedef20c3f3f96f4f18979b864d1
--- lams_tool_wiki/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 1082bdcc357c105126a5641cecc68acfa645b66b)
+++ lams_tool_wiki/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 49e5b8d736ebbedef20c3f3f96f4f18979b864d1)
@@ -1,6 +1,6 @@
 
 <%
-	 /****************************************************************
+	/****************************************************************
 	 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
 	 * =============================================================
 	 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
@@ -49,10 +49,18 @@
 	<c:set var="buttonTryAgainKey" value="button.try.again" />
 </c:if>
 
-<p>
-	<fmt:message key="${defineLaterMessageKey}" />
-</p>
-<div align="right" class="space-bottom-top">
-	<a href="javascript:location.reload(true);" class="button"><fmt:message
-			key="${buttonTryAgainKey}" /> </a>
+<div class="row no-gutter">
+	<div
+		class="col-xs-12 col-sm-offset-1 col-sm-10 col-lg-offset-2 col-lg-8">
+		<div class="alert alert-info">
+			<fmt:message key="${defineLaterMessageKey}" />
+		</div>
+	</div>
 </div>
+<div class="row no-gutter">
+	<div class="col-xs-12">
+		<a href="javascript:location.reload(true);"
+			class="btn btn-primary pull-right voffset5"><fmt:message
+				key="${buttonTryAgainKey}" /></a>
+	</div>
+</div>
\ No newline at end of file
Index: lams_tool_wiki/web/WEB-INF/tags/Page.tag
===================================================================
diff -u
--- lams_tool_wiki/web/WEB-INF/tags/Page.tag	(revision 0)
+++ lams_tool_wiki/web/WEB-INF/tags/Page.tag	(revision 49e5b8d736ebbedef20c3f3f96f4f18979b864d1)
@@ -0,0 +1,36 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+
+<%@ attribute name="type" required="true" rtexprvalue="true"%>
+<%@ attribute name="style" required="false" rtexprvalue="true"%>
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
+<%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+
+
+
+<div class="row no-gutter">
+	<div class="col-xs-12">
+		<div class="container" id="content">
+			<div class="panel panel-default panel-${type}-page">
+				<div class="panel-heading">
+					<c:if test="${not empty title}">
+						<div class="panel-title panel-${type}-title">
+							<c:out value="${title}" escapeXml="true" />
+							<c:if test="${not empty titleHelpURL}">
+								<a style="float: right" href="${titleHelpURL}" target="_new"><span class="help" style="margin: 0px"></span></a>
+							</c:if>
+						</div>
+					</c:if>
+					<c:if test="${not empty headingContent}">
+						<c:out value="${headingContent}" escapeXml="true" />
+					</c:if>
+				</div>
+				<div class="panel-body panel-${type}-body">
+					<jsp:doBody />
+				</div>
+			</div>
+		</div>
+		<! -- End content container -->
+	</div>
+</div>
Index: lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r86a2855c49422f236ac31c35df38fa3c66220dcc -r49e5b8d736ebbedef20c3f3f96f4f18979b864d1
--- lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 86a2855c49422f236ac31c35df38fa3c66220dcc)
+++ lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 49e5b8d736ebbedef20c3f3f96f4f18979b864d1)
@@ -440,6 +440,14 @@
 		<path>/WEB-INF/tags/DefineLater.tag</path>
    	</tag-file>  
    	<tag-file>
+	    <name>Alert</name>
+		<path>/WEB-INF/tags/Alert.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>Page</name>
+		<path>/WEB-INF/tags/Page.tag</path>
+   	</tag-file>  
+   	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
    	</tag-file>
Index: lams_tool_wiki/web/common/learnerheader.jsp
===================================================================
diff -u -rac72a6964effa84f92df3bca11da8732c8b9bf8a -r49e5b8d736ebbedef20c3f3f96f4f18979b864d1
--- lams_tool_wiki/web/common/learnerheader.jsp	(.../learnerheader.jsp)	(revision ac72a6964effa84f92df3bca11da8732c8b9bf8a)
+++ lams_tool_wiki/web/common/learnerheader.jsp	(.../learnerheader.jsp)	(revision 49e5b8d736ebbedef20c3f3f96f4f18979b864d1)
@@ -16,4 +16,6 @@
 
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
 	<script type="text/javascript" src="${tool}includes/javascript/wikiCommon.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
 </lams:head>
Index: lams_tool_wiki/web/common/message.jsp
===================================================================
diff -u -r1082bdcc357c105126a5641cecc68acfa645b66b -r49e5b8d736ebbedef20c3f3f96f4f18979b864d1
--- lams_tool_wiki/web/common/message.jsp	(.../message.jsp)	(revision 1082bdcc357c105126a5641cecc68acfa645b66b)
+++ lams_tool_wiki/web/common/message.jsp	(.../message.jsp)	(revision 49e5b8d736ebbedef20c3f3f96f4f18979b864d1)
@@ -1,5 +1,5 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<p>
+<lams:Alert id="messages" type="info" close="true">
 	${requestScope.message};
-</p>
+</lams:Alert>
\ No newline at end of file
Index: lams_tool_wiki/web/pages/learning/defineLater.jsp
===================================================================
diff -u -r1082bdcc357c105126a5641cecc68acfa645b66b -r49e5b8d736ebbedef20c3f3f96f4f18979b864d1
--- lams_tool_wiki/web/pages/learning/defineLater.jsp	(.../defineLater.jsp)	(revision 1082bdcc357c105126a5641cecc68acfa645b66b)
+++ lams_tool_wiki/web/pages/learning/defineLater.jsp	(.../defineLater.jsp)	(revision 49e5b8d736ebbedef20c3f3f96f4f18979b864d1)
@@ -1,11 +1,9 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<div id="content">
-	<h1>
-		<fmt:message key="activity.title" />
-	</h1>
-	<lams:DefineLater defineLaterMessageKey="message.defineLaterSet" />
-</div>
+<c:set var="title" scope="request">
+	<fmt:message key="activity.title" />
+</c:set>
 
-
-
+<lams:Page type="learner" title="${title}">
+				<lams:DefineLater defineLaterMessageKey="message.defineLaterSet" />
+</lams:Page>
\ No newline at end of file
Index: lams_tool_wiki/web/pages/learning/notebook.jsp
===================================================================
diff -u -r725a8b0e55b44174a2911ac36ec6fef800c7ef20 -r49e5b8d736ebbedef20c3f3f96f4f18979b864d1
--- lams_tool_wiki/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 725a8b0e55b44174a2911ac36ec6fef800c7ef20)
+++ lams_tool_wiki/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 49e5b8d736ebbedef20c3f3f96f4f18979b864d1)
@@ -4,43 +4,45 @@
 	function disableFinishButton() {
 		document.getElementById("finishButton").disabled = true;
 	}
-         function submitForm(methodName){
-                var f = document.getElementById('messageForm');
-                f.submit();
-        }
+	function submitForm(methodName) {
+		var f = document.getElementById('messageForm');
+		f.submit();
+	}
 </script>
 
-<div id="content">
-	<h1>
-		<c:out value="${wikiDTO.title}" escapeXml="true"/>
-	</h1>
-
+<lams:Page type="learner" title="${wikiDTO.title}">
 	<html:form action="/learning" method="post" onsubmit="disableFinishButton();" styleId="messageForm">
-		<html:hidden property="toolSessionID" styleId="toolSessionID"/>
+		<html:hidden property="toolSessionID" styleId="toolSessionID" />
 		<html:hidden property="mode" value="${mode}" />
-		
-		<p class="small-space-top">
-			<lams:out value="${wikiDTO.reflectInstructions}"  escapeHtml="true"/>
-		</p>
 
-		<html:textarea cols="60" rows="8" property="entryText"
-			styleClass="text-area"></html:textarea>
+		<div class="panel">
+			<lams:out value="${wikiDTO.reflectInstructions}" escapeHtml="true" />
+		</div>
+		<div class="form-group">
+			<html:textarea styleId="focused" rows="4" property="entryText" styleClass="form-control"></html:textarea>
 
-		<div class="space-bottom-top align-right">
+
 			<html:hidden property="dispatch" value="submitReflection" />
-			<html:link href="#nogo" styleClass="button" styleId="finishButton"  onclick="submitForm('finish');return false">
-				<span class="nextActivity">
-					<c:choose>
-						<c:when test="${activityPosition.last}">
-							<fmt:message key="button.submit" />
-						</c:when>
-						<c:otherwise>
-							<fmt:message key="button.finish" />
-						</c:otherwise>
-					</c:choose>
-				</span>
+			<html:link href="#nogo" styleClass="btn btn-primary voffset5 pull-right na" styleId="finishButton"
+				onclick="submitForm('finish');return false">
+				<c:choose>
+					<c:when test="${activityPosition.last}">
+						<fmt:message key="button.submit" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="button.finish" />
+					</c:otherwise>
+				</c:choose>
 			</html:link>
 		</div>
 	</html:form>
-</div>
 
+</lams:Page>
+
+	<script type="text/javascript">
+		window.onload = function() {
+			document.getElementById("focused").focus();
+		}
+	</script>
+
+
Index: lams_tool_wiki/web/pages/learning/parts/finishButton.jsp
===================================================================
diff -u -r725a8b0e55b44174a2911ac36ec6fef800c7ef20 -r49e5b8d736ebbedef20c3f3f96f4f18979b864d1
--- lams_tool_wiki/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision 725a8b0e55b44174a2911ac36ec6fef800c7ef20)
+++ lams_tool_wiki/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision 49e5b8d736ebbedef20c3f3f96f4f18979b864d1)
@@ -1,83 +1,76 @@
 <%@ include file="/common/taglibs.jsp"%>
-<script type="text/javascript">
-	function disableFinishButton() {
-		var finishButton = document.getElementById("finishButton");
-		if (finishButton != null) {
-			finishButton.disabled = true;
-		}
-	}
-	
-	function continueOrFinish(dispatch) {
-		document.getElementById("learningButtonForm").action += "?dispatch=" + dispatch;
-		document.getElementById("learningButtonForm").submit();
-	}
-</script>
+  <script type="text/javascript">
+    function disableFinishButton() {
+      var finishButton = document.getElementById("finishButton");
+      if (finishButton != null) {
+        finishButton.disabled = true;
+      }
+    }
 
-<c:if test="${userDTO.finishedActivity and wikiDTO.reflectOnActivity}">
-<html:form action="/learning" method="get" styleId="reflectEditForm">
-	<html:hidden property="dispatch" value="openNotebook" />
-	<html:hidden property="mode" value="${mode}" />	
-	<html:hidden property="toolSessionID" styleId="toolSessionID"/>
-		<div class="space-top">
-			<h2>
-				<lams:out value="${wikiDTO.reflectInstructions}" escapeHtml="true"/>
-			</h2>
+    function continueOrFinish(dispatch) {
+      document.getElementById("learningButtonForm").action += "?dispatch=" + dispatch;
+      document.getElementById("learningButtonForm").submit();
+    }
+  </script>
 
-			<p>
-				<c:choose>
-					<c:when test="${not empty userDTO.notebookEntry}">
-						<lams:out escapeHtml="true" value="${userDTO.notebookEntry}" />
-					</c:when>
+  <c:if test="${userDTO.finishedActivity and wikiDTO.reflectOnActivity}">
+    <html:form action="/learning" method="get" styleId="reflectEditForm">
+      <html:hidden property="dispatch" value="openNotebook" />
+      <html:hidden property="mode" value="${mode}" />	
+      <html:hidden property="toolSessionID" styleId="toolSessionID"/>
+      <div class="panel panel-default">
+        <div class="panel heading">
+          <h4 class="panel-title">
+            <lams:out value="${wikiDTO.reflectInstructions}" escapeHtml="true"/>
+          </h4>
+        </div>
+        <div class="panel-body">
+          <c:choose>
+            <c:when test="${not empty userDTO.notebookEntry}">
+              <lams:out escapeHtml="true" value="${userDTO.notebookEntry}" />
+            </c:when>
 
-					<c:otherwise>
-						<em><fmt:message key="message.no.reflection.available" /> </em>
-					</c:otherwise>
-				</c:choose>
-			</p>
+            <c:otherwise>
+              <fmt:message key="message.no.reflection.available" />
+            </c:otherwise>
+          </c:choose>
+          <hr class="mgs-hr"/>
+          <html:submit styleClass="btn btn-primary">
+            <fmt:message key="button.edit" />
+          </html:submit>	
+        </div>
 
-			<html:submit styleClass="button">
-				<fmt:message key="button.edit" />
-			</html:submit>			
-		</div>
-	
-</html:form>
-</c:if>
+      </div>
 
-<html:form action="/learning" method="post" onsubmit="disableFinishButton();" styleId="learningButtonForm">
-	<html:hidden property="toolSessionID" styleId="toolSessionID"/>
-	<html:hidden property="mode" value="${mode}" />	
-	<div class="space-bottom-top align-right" id="finishButtonDiv">
-		<c:choose>
-			<c:when test="${!userDTO.finishedActivity and wikiDTO.reflectOnActivity}">
-				
-				<a href="javascript:continueOrFinish('openNotebook');" class="button"><fmt:message key="button.continue" /></a>
+    </html:form>
+  </c:if>
 
-			</c:when>
-			<c:otherwise>
+  <html:form action="/learning" method="post" onsubmit="disableFinishButton();" styleId="learningButtonForm">
+    <html:hidden property="toolSessionID" styleId="toolSessionID"/>
+    <html:hidden property="mode" value="${mode}" />	
+    <div class="pull-right voffset5" id="finishButtonDiv">
+      <c:choose>
+        <c:when test="${!userDTO.finishedActivity and wikiDTO.reflectOnActivity}">
 
-			<div align="right" class="space-bottom-top">
-					<html:link href="#nogo" styleClass="button" styleId="finishButton"
-						onclick="javascript:continueOrFinish('finishActivity'); return false">
-						<span class="nextActivity">
-							<c:choose>
-								<c:when test="${activityPosition.last}">
-									<fmt:message key="button.submit" />
-								</c:when>
-								<c:otherwise>
-									<fmt:message key="button.finish" />
-								</c:otherwise>
-							</c:choose>
-						</span>
-					</html:link>
-				</div>
-			</c:otherwise>
-		</c:choose>
-	</div>
-</html:form>
+          <a href="javascript:continueOrFinish('openNotebook');" class="btn btn-primary"><fmt:message key="button.continue" /></a>
 
+        </c:when>
+        <c:otherwise>
 
-
-
-
-
-
+          <div class="pull-right voffset5">
+            <html:link href="#nogo" styleClass="btn btn-primary na" styleId="finishButton"
+                       onclick="javascript:continueOrFinish('finishActivity'); return false">
+              <c:choose>
+                <c:when test="${activityPosition.last}">
+                  <fmt:message key="button.submit" />
+                </c:when>
+                <c:otherwise>
+                  <fmt:message key="button.finish" />
+                </c:otherwise>
+              </c:choose>
+            </html:link>
+          </div>
+        </c:otherwise>
+      </c:choose>
+    </div>
+  </html:form>
Index: lams_tool_wiki/web/pages/learning/wiki.jsp
===================================================================
diff -u -r725a8b0e55b44174a2911ac36ec6fef800c7ef20 -r49e5b8d736ebbedef20c3f3f96f4f18979b864d1
--- lams_tool_wiki/web/pages/learning/wiki.jsp	(.../wiki.jsp)	(revision 725a8b0e55b44174a2911ac36ec6fef800c7ef20)
+++ lams_tool_wiki/web/pages/learning/wiki.jsp	(.../wiki.jsp)	(revision 49e5b8d736ebbedef20c3f3f96f4f18979b864d1)
@@ -1,512 +1,539 @@
 <%@ include file="/common/taglibs.jsp"%>
-<%@ page import="org.lamsfoundation.lams.tool.wiki.util.WikiConstants"%>
-<link href="includes/css/wiki_style.css" rel="stylesheet" type="text/css">
-<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
-<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
-<script language="JavaScript" type="text/javascript" src="includes/javascript/validation.js"></script>
-<script type="text/javascript">
-<!--
-	var mode = "${mode}";
-	var formName = "learningForm"
+  <%@ page import="org.lamsfoundation.lams.tool.wiki.util.WikiConstants"%>
+    <link href="includes/css/wiki_style.css" rel="stylesheet" type="text/css">
+    <script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+    <script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+    <script language="JavaScript" type="text/javascript" src="includes/javascript/validation.js"></script>
 
-	function disableFinishButton() {
-		document.getElementById("finishButton").disabled = true;
-	}
-	
-	function validateForm() {
-	
-		// Validates that there's input from the user. 
-		
-		// disables the Finish button to avoid double submission 
-		disableFinishButton();
+    <script type="text/javascript">
+      <!--
+        var mode = "${mode}";
+      var formName = "learningForm"
 
- 		if (mode == "learner") {
-			// if this is learner mode, then we add this validation see (LDEV-1319)
-		
-			if (document.learningForm.entryText.value == "") {
-				
-				// if the input is blank, then we further inquire to make sure it is correct
-				if (confirm("<fmt:message>message.learner.blank.input</fmt:message>"))  {
-					// if correct, submit form
-					return true;
-				} else {
-					// otherwise, focus on the text area
-					document.learningForm.entryText.focus();
-					document.getElementById("finishButton").disabled = false;
-					return false;      
-				}
-			} else {
-				// there was something on the form, so submit the form
-				return true;
-			}
-		}
-	}
+      function disableFinishButton() {
+        document.getElementById("finishButton").disabled = true;
+      }
 
--->
-</script>
+      function validateForm() {
 
+        // Validates that there's input from the user. 
 
-<div id="content">
-	<div style="float: right; margin-left: 10px; padding-top: 4px" class="help">
-		<lams:help toolSignature="<%=WikiConstants.TOOL_SIGNATURE%>" module="learning" />
-	</div>
-	
-	
-	<!-- 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.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>
-		</c:if>
-	</div>
-	<c:if test="${currentWikiPage.deleted}">
-		<p class="warning"><fmt:message key="label.wiki.removed" /></p>
-	</c:if>
+        // disables the Finish button to avoid double submission 
+        disableFinishButton();
 
-	&nbsp; 
+        if (mode == "learner") {
+          // if this is learner mode, then we add this validation see (LDEV-1319)
 
-	<html:form action="/learning" method="post"styleId="learningForm" enctype="multipart/form-data">
-		<html:hidden property="toolSessionID" />
-		<html:hidden property="mode" />
-		<input type="hidden" name="userID" value="${userDTO.userId}"/>
-		<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: 50%;">
-				<c:if test="${currentWikiPage.title != mainWikiPage.title}">
-					<a href="javascript:changeWikiPage('${fn:escapeXml(mainWikiPage.javaScriptTitle)}')">${fn:escapeXml(mainWikiPage.title)}</a> :
-				</c:if> 
-				<a href="javascript:changeWikiPage('${fn:escapeXml(currentWikiPage.javaScriptTitle)}')">${fn:escapeXml(currentWikiPage.title)}</a>
-			</div>
-	
-			<div id="buttons" style="float: right; width: 50%; text-align:right;">
-			
-				<c:if test="${contentEditable}">
-				
-					<a href="javascript:refreshPage();" title="<fmt:message key="label.wiki.refresh.toolTip"></fmt:message>">
-						<fmt:message key="label.wiki.refresh"></fmt:message>
-					</a> 
-					
-					<c:if test="${editableFlag or addFlag}">
-						&nbsp;
-						<a href="javascript:changeDiv('view');" title="<fmt:message key="label.wiki.view.toolTip"></fmt:message>">
-							<fmt:message key="label.wiki.view"></fmt:message>
-						</a>
-					</c:if>
-					
-					<c:if test="${editableFlag and not currentWikiPage.deleted}">
-						&nbsp;
-						<a href="javascript:changeDiv('edit');" title="<fmt:message key="label.wiki.edit.toolTip"></fmt:message>">
-							<fmt:message key="label.wiki.edit"></fmt:message>
-						</a>
-					</c:if>
-					
-					<c:if test="${addFlag}">
-						&nbsp;
-						<a href="javascript:cancelAdd();changeDiv('add');" title="<fmt:message key="label.wiki.add.toolTip"></fmt:message>">
-							<fmt:message key="label.wiki.add"></fmt:message>
-						</a>
-					</c:if>
-					
-					<c:if test="${editableFlag}">
-						&nbsp;
-						<a href="javascript:changeDiv('history');" title="<fmt:message key="label.wiki.history.toolTip"></fmt:message>">
-							<fmt:message key="label.wiki.history"></fmt:message>
-						</a>
-					</c:if>
-					
-					<c:if test="${currentWikiPage.title != mainWikiPage.title and not currentWikiPage.deleted}">
-						&nbsp;
-						<a href="javascript:doRemove('<fmt:message key="label.wiki.remove.mark.confirm"></fmt:message>')"
-							title="<fmt:message key="label.wiki.remove.mark.toolTip"></fmt:message>"
-						>
-							<fmt:message key="label.wiki.remove"></fmt:message>
-						</a>
-					</c:if>
-					<c:if test="${currentWikiPage.deleted and editableFlag}">
-						&nbsp;
-						<a href="javascript:submitWiki('restorePage')"
-							title="<fmt:message key="label.wiki.restore.toolTip"></fmt:message>"
-						>
-							<fmt:message key="label.wiki.restore"></fmt:message>
-						</a>	
-					</c:if>
-				</c:if>
-			</div>
-		</div>
-	
-		<br />
-		<br />
-		<hr />
-		<br />
-	
-		<div id="view">
-			<h1>${fn:escapeXml(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>
-								<c:out value="${currentWikiPage.currentWikiContentDTO.editorDTO.firstName} ${currentWikiPage.currentWikiContentDTO.editorDTO.lastName}" escapeXml="true"/>
-							</c:otherwise>
-						</c:choose>
-					</fmt:param>
-					<fmt:param>
-						<lams:Date value="${currentWikiPage.currentWikiContentDTO.editDate}" />
-					</fmt:param>
-				</fmt:message> 
-				
-				<br />
-				
-				<fmt:message key="notify.learner.query">
-					<fmt:param>
-						<a href="javascript:submitWiki('toggleLearnerSubsciption');">
-							<c:choose>
-								<c:when test="${userDTO.notificationEnabled}">
-									<fmt:message key="notify.learner.unsubscribe" />
-								</c:when>
-								<c:otherwise>
-									<fmt:message key="notify.learner.subscribe" />
-								</c:otherwise>
-							</c:choose>
-						</a>
-					</fmt:param>
-				</fmt:message>
-			</i> 
-			
-			<br />
-			<br />
-			<div id="viewBody">
-				<c:out value="${currentWikiPage.currentWikiContentDTO.body}" escapeXml="false"/>
-			</div>
-		</div>
-	
-		<div id="history" style="display: none;">
-			<h1>
-				<fmt:message key="label.wiki.history" /> - ${fn:escapeXml(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>
-									
-									<td>
-										<lams:Date value="${wikiContentPageVersion.editDate}" />
-									</td>
-									
-									<td>
-										<c:choose>
-											<c:when test="${wikiContentPageVersion.editorDTO != null}">
-												<c:out value="${wikiContentPageVersion.editorDTO.firstName} ${wikiContentPageVersion.editorDTO.lastName}" escapeXml="true"/>
-											</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}');" 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> - ${fn:escapeXml(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><span style="display: none;'" class="title error"><fmt:message key="error.title.invalid.characters"/>
-					</td>
-				</tr>
-				<tr>
-					<td>
-						<div class="field-name">
-							<fmt:message key="label.wiki.body"></fmt:message>
-						</div>
-						<lams:CKEditor id="wikiBody"
-							value="${currentWikiPage.currentWikiContentDTO.body}"
-							contentFolderID="${contentFolderID}" toolbarSet="CustomWiki"
-							height="400px">
-						</lams:CKEditor>
-					</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><span style="display: none;'" class="newPageTitle error"><fmt:message key="error.title.invalid.characters"/>
-					</td>
-				</tr>
-				<tr>
-					<td>
-						<div class="field-name">
-							<fmt:message key="label.wiki.body"></fmt:message>
-						</div>
-						
-						<lams:CKEditor id="newPageWikiBody" value="" height="400px"
-							contentFolderID="${contentFolderID}" toolbarSet="CustomWiki">
-						</lams:CKEditor>
-					</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>
+          if (document.learningForm.entryText.value == "") {
 
-		<img src="<lams:WebAppURL />/images/tree_closed.gif" id="wikiListImage" 
-			onclick="javascript:toggleWikiList('<lams:WebAppURL />')" />
-		&nbsp;
-		<a href="javascript:changeWikiPage('${fn:escapeXml(mainWikiPage.javaScriptTitle)}')">${fn:escapeXml(mainWikiPage.title)}</a>
-		<div id="wikiList" style="display:none;">
-			<c:forEach var="wikiPage" items="${wikiPages}">
-				<c:if test="${wikiPage.title != mainWikiPage.title}">
-					&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-					<a href="javascript:changeWikiPage('${fn:escapeXml(wikiPage.javaScriptTitle)}')">${fn:escapeXml(wikiPage.title)}</a>
-					<br />
-				</c:if> 
-			</c:forEach>
-		</div>
-	</html:form> 
+            // if the input is blank, then we further inquire to make sure it is correct
+            if (confirm("<fmt:message>message.learner.blank.input</fmt:message>"))  {
+              // if correct, submit form
+              return true;
+            } else {
+              // otherwise, focus on the text area
+              document.learningForm.entryText.focus();
+              document.getElementById("finishButton").disabled = false;
+              return false;      
+            }
+          } else {
+            // there was something on the form, so submit the form
+            return true;
+          }
+        }
+      }
 
-	<div id="finishButtonDiv"></div>
-	
-	<c:if test="${ (mode == 'learner' && minEditsReached ) || mode == 'author'}">
-		<%@ include file="parts/finishButton.jsp"%>
-	</c:if>
-	
+      -->
+    </script>
+    <html:form action="/learning" method="post"styleId="learningForm" enctype="multipart/form-data">
+
+      <div class="container" id="content">
+        <div class="row no-gutter">
+          <div class="col-xs-12">
+            <div class="panel panel-default panel-learner-title">
+              <div class="panel-heading">
+                <c:if test="${currentWikiPage.title != mainWikiPage.title}">
+                  <a class="panel-title panel-learner-title pull-left" href="javascript:changeWikiPage('${fn:escapeXml(mainWikiPage.javaScriptTitle)}')"> ${fn:escapeXml(mainWikiPage.title)}</a>&nbsp;/&nbsp;
+                </c:if> 
+                <a class="panel-title panel-learner-title"  href="javascript:changeWikiPage('${fn:escapeXml(currentWikiPage.javaScriptTitle)}')">${fn:escapeXml(currentWikiPage.title)}</a>
+
+
+                <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}" />
+
+                <!-- begin wiki menu-->
+
+                <div class="btn-group pull-right">
+                  <c:if test="${contentEditable}">
+
+                    <a href="javascript:refreshPage();" title="<fmt:message key='label.wiki.refresh.toolTip'/>" type="button" class="btn btn-xs btn-default"><i class="fa fa-xm fa-refresh"></i> <fmt:message key="label.wiki.refresh"/></a>
+
+                    <c:if test="${editableFlag or addFlag}">
+                      <a href="javascript:changeDiv('view');" title="<fmt:message key='label.wiki.view.toolTip'/>" type="button" class="btn btn-xs btn-default"><i class="fa fa-xm fa-play"></i> <fmt:message key="label.wiki.view"/></a>
+                    </c:if>
+
+                    <c:if test="${editableFlag and not currentWikiPage.deleted}">
+                      <a href="javascript:changeDiv('edit');" title="<fmt:message key='label.wiki.edit.toolTip'/>" type="button" class="btn btn-xs btn-default"><i class="fa fa-xm fa-pencil"></i> <fmt:message key="label.wiki.edit"/></a>
+                    </c:if>
+
+                    <c:if test="${addFlag}">
+                      <a href="javascript:cancelAdd();changeDiv('add');" title="<fmt:message key='label.wiki.add.toolTip'/>" type="button" class="btn btn-xs btn-default"><i class="fa fa-xm fa-plus"></i> 
+                        <fmt:message key="label.wiki.add"/></a>
+                    </c:if>
+
+                    <c:if test="${editableFlag}">
+                      <a href="javascript:changeDiv('history');" title="<fmt:message key='label.wiki.history.toolTip'/>" 
+                         type="button" class="btn btn-xs btn-default"><i class="fa fa-xm fa-history"></i> 
+                        <fmt:message key="label.wiki.history"/>
+                      </a>
+                    </c:if>
+
+                    <c:if test="${currentWikiPage.title != mainWikiPage.title and not currentWikiPage.deleted}">
+
+                      <a type="button" class="btn btn-xs btn-default" href="javascript:doRemove('<fmt:message key="label.wiki.remove.mark.confirm"/>')"
+                         title="<fmt:message key="label.wiki.remove.mark.toolTip"/>"
+                         ><i class="fa fa-xm fa-trash"></i> 
+                        <fmt:message key="label.wiki.remove"></fmt:message>
+                      </a>
+                    </c:if>
+                    <c:if test="${currentWikiPage.deleted and editableFlag}">
+
+                      <a type="button" class="btn btn-xs btn-default" href="javascript:submitWiki('restorePage')"
+                         title="<fmt:message key="label.wiki.restore.toolTip"/>"
+                         ><i class="fa fa-xm fa-backward"></i> 
+                        <fmt:message key="label.wiki.restore"/>
+                      </a>	
+                    </c:if>                    
+
+                  </c:if>
+
+                </div> <!-- end wiki top menu -->               
+              </div>
+              <div class="panel-body">
+                <!--
+<div style="float: right; margin-left: 10px; position:relative; padding-top: 4px" class="help">
+<lams:help toolSignature="<%=WikiConstants.TOOL_SIGNATURE%>" module="learning" />
 </div>
+-->
+                <!-- Display the advanced option warnings -->
+                    <c:if test="${wikiDTO.lockOnFinish and mode == 'learner'}">
+                      <lams:Alert type="info" close="true" id="lockWhenFinished">
+                        <c:choose>
+                          <c:when test="${finishedActivity}">
+                            <fmt:message key="message.activityLocked" />
+                          </c:when>
+                          <c:otherwise>
+                            <fmt:message key="message.warnLockOnFinish" />
+                          </c:otherwise>
+                        </c:choose>
+                      </lams:Alert>
+                    </c:if> 
 
-<script type="text/javascript">
-<!--
-	var wikiLinkArray = new Array();
-	populateWikiLinkArray();
-	function populateWikiLinkArray()
-	{
-		<c:forEach var="wikiPage" items="${wikiPages}">
-			wikiLinkArray[wikiLinkArray.length] = '${fn:escapeXml(wikiPage.javaScriptTitle)}';
-		</c:forEach>
-		document.getElementById("wikiLinks").value = wikiLinkArray.toString();
-	}
-	
-	displayMessageDiv();
-	function displayMessageDiv()
-	{
-		var messageDiv = document.getElementById("messageDiv");
+                    <c:if test="${not (wikiDTO.lockOnFinish and finishedActivity) }">
+                      <c:choose>
+                        <c:when test="${currentWikiPage.editable}">
+                          <c:if test="${not minEditsReached}">
+                            <lams:Alert id="limitEdits" close="true" type="info">
+                              <fmt:message key="message.minumumEditsNotReached">
+                                <fmt:param>
+                                  ${wikiDTO.minimumEdits}
+                                </fmt:param>
+                              </fmt:message>
+                            </lams:Alert>
+                          </c:if>
 
-		if (trim(messageDiv.innerHTML) != "")
-		{
-			messageDiv.style.display="block";
-		}
-	}
-	
-	function doEditOrAdd(dispatch)
-	{
-		
-		var title="";
-		if(dispatch == "editPage")
-		{
-			title = document.getElementById("title").value;
-		}
-		else
-		{
-			title = document.getElementById("newPageTitle").value;
-		}
-		
-		var i;
-		
-		if (title == null || trim(title).length == 0)
-		{
-			alert("<fmt:message key='label.wiki.add.title.required'></fmt:message>");
-			return;
-		}
-		
-		for (i=0; i<wikiLinkArray.length; i++)
-		{
-			if(dispatch == "editPage" && wikiLinkArray[i] == '${fn:escapeXml(currentWikiPage.javaScriptTitle)}')
-			{
-				continue;
-			}
-			
-			if (trim(title) == wikiLinkArray[i])
-			{
-				alert("<fmt:message key='label.wiki.add.title.exists'><fmt:param>" + title + "</fmt:param></fmt:message>");
-				return;
-			}
-		}
-		
-		// if all validation fulfilled, we can continue
-		document.getElementById("title").value = trim(title);
-		submitWiki(dispatch);
-	}
-	
-	function submitWiki(dispatch)
-	{
-		document.getElementById("learningForm").action += "?dispatch=" + dispatch;
-		replaceJavascriptTokenAndSubmit("learningForm");
-	}
+                          <c:if test="${wikiDTO.maximumEdits > 0}">
+                            <lams:Alert id="maxEditsReached" close="true" type="info">
+                              <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>
+                            </lams:Alert>
+                          </c:if>
+                        </c:when>
+                        <c:otherwise>
+                          <lams:Alert id="pageNotEditable" type="danger" close="false">
+                            <fmt:message key="message.pageNotEditable" />
+                          </lams:Alert>
+                        </c:otherwise>
 
+                      </c:choose>
 
-	function hideToolbarItem(editorInstance, itemName) {
-		
-		editorInstance.ui.items[itemName].setState(CKEDITOR.TRISTATE_DISABLED);
-		/*
+
+                    </c:if>
+
+                    <c:if test="${currentWikiPage.deleted}">
+                      <lams:Alert id="pageRemoved" type="danger" close="false">
+                        <fmt:message key="label.wiki.removed" />
+                      </lams:Alert>
+                    </c:if>
+                <!-- end annoucements -->
+
+                <!-- Wiki main -->
+                <div class="row no-gutter">
+                  <div class="col-xs-12">
+
+                    <div class="panel panel-default" id="view">
+                      <div class="panel-heading">
+                        <h4 class="panel-title">${fn:escapeXml(currentWikiPage.title)}</h4>
+                        <!-- Last edited -->
+                        <div class="voffset5" style="font-size: 12px">
+                          <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"/>
+                                </c:when>
+                                <c:otherwise>
+                                  <c:out value="${currentWikiPage.currentWikiContentDTO.editorDTO.firstName} ${currentWikiPage.currentWikiContentDTO.editorDTO.lastName}" escapeXml="true"/>
+                                </c:otherwise>
+                              </c:choose>
+                            </fmt:param>
+                            <fmt:param>
+                              <time class="timeago" datetime="<fmt:formatDate value='${currentWikiPage.currentWikiContentDTO.editDate}' pattern="yyyy-MM-dd'T'HH:mm:ss.S'Z'"/>"><lams:Date value="${currentWikiPage.currentWikiContentDTO.editDate}" /></time>
+                            </fmt:param>
+                          </fmt:message> 
+                        </div> <!-- End last edited -->
+                      </div>
+                      <div class="panel-body" id="viewBody">
+                        <c:out value="${currentWikiPage.currentWikiContentDTO.body}" escapeXml="false"/>
+                      </div>
+                      <div class="panel-footer" style="font-size: 12px">
+                        <i class="fa fa-envelope"></i> 
+                        <fmt:message key="notify.learner.query">
+                          <fmt:param>
+                            <a href="javascript:submitWiki('toggleLearnerSubsciption');">
+                              <c:choose>
+                                <c:when test="${userDTO.notificationEnabled}">
+                                  <fmt:message key="notify.learner.unsubscribe" />
+                                </c:when>
+                                <c:otherwise>
+                                  <fmt:message key="notify.learner.subscribe" />
+                                </c:otherwise>
+                              </c:choose>
+                            </a>
+                          </fmt:param>
+                        </fmt:message>
+
+                      </div>
+                    </div>
+
+
+                  </div>
+                </div> <!-- end Wiki main content -->
+
+                <!-- Begin form -->
+                <html:hidden property="toolSessionID" />
+                <html:hidden property="mode" />
+                <input type="hidden" name="userID" value="${userDTO.userId}"/>
+                <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" />
+
+
+                <div class="panel panel-default" id="history" style="display: none">
+                  <div class="panel-heading">
+                    <h4 class="panel-title">
+                      <fmt:message key="label.wiki.history" /> - ${fn:escapeXml(currentWikiPage.title)}
+                    </h4>
+                  </div>
+                  <div class="panel-body">
+                    <c:choose>
+                      <c:when test="${not empty wikiPageContentHistory}">
+                        <table class="table table-stripped table-condensed">
+                          <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>
+
+                                <td>
+                                  <lams:Date value="${wikiContentPageVersion.editDate}" />
+                                </td>
+
+                                <td>
+                                  <c:choose>
+                                    <c:when test="${wikiContentPageVersion.editorDTO != null}">
+                                      <c:out value="${wikiContentPageVersion.editorDTO.firstName} ${wikiContentPageVersion.editorDTO.lastName}" escapeXml="true"/>
+                                    </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}');" 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>
+
+
+                <div class="panel panel-default" id="edit" style="display: none">
+                  <div class="panel-heading">
+                    <h4 clas="panel-title">
+                      <fmt:message key="label.wiki.edit"></fmt:message> - ${fn:escapeXml(currentWikiPage.title)}
+                    </h4>
+                  </div>
+                  <div class="panel-body">
+                    <table class="table table-stripped table-condensed">
+                      <tr>
+                        <td>
+                          <div class="field-name">
+                            <fmt:message key="label.authoring.basic.title"></fmt:message>
+                          </div>
+
+                          <html:text styleClass="form-control" property="title" styleId="title" style="width: 99%;" value="${currentWikiPage.title}"></html:text><span style="display: none;'" class="title error"><fmt:message key="error.title.invalid.characters"/>
+                          </td>
+                      </tr>
+                      <tr>
+                        <td>
+                          <div class="field-name">
+                            <fmt:message key="label.wiki.body"></fmt:message>
+                          </div>
+                          <lams:CKEditor id="wikiBody"
+                                         value="${currentWikiPage.currentWikiContentDTO.body}"
+                                         contentFolderID="${contentFolderID}" toolbarSet="CustomWiki"
+                                         height="400px">
+                          </lams:CKEditor>
+                        </td>
+                      </tr>
+                      <tr>
+                        <td>
+                          <div class="voffset5 pull-right">
+                            <a href="javascript:changeDiv('view');" class="btn btn-primary"><fmt:message key="button.cancel"/></a> 
+                            <a href="javascript:doEditOrAdd('editPage');" class="btn btn-primary"><fmt:message key="label.wiki.savechanges"></fmt:message></a>
+                          </div>
+                        </td>
+                      </tr>
+                    </table>
+                  </div>
+                </div>
+
+                <div id="add" style="display: none;">
+                  <div class="row no-gutter">
+                    <div class="col-xs-12">
+
+                      <div class="panel panel-default" id="view">
+                        <div class="panel-heading">
+
+                          <h4 class="panel-title">
+                            <fmt:message key="label.wiki.add"></fmt:message>
+                          </h4>
+                        </div>
+                        <div class="panel-body">
+                          <div class="field-name">
+                            <fmt:message key="label.authoring.basic.title"/>
+                          </div>
+                          <html:text property="newPageTitle" styleId="newPageTitle" styleClass="form-control" value=""></html:text><span style="display: none;'" class="newPageTitle error">
+                          <fmt:message key="error.title.invalid.characters"/>
+                          </span>
+
+                          <div class="field-name">
+                            <fmt:message key="label.wiki.body"></fmt:message>
+                          </div>
+                          <lams:CKEditor id="newPageWikiBody" value="" height="400px"
+                                         contentFolderID="${contentFolderID}" toolbarSet="CustomWiki">
+                          </lams:CKEditor>
+
+                          <a href="javascript:doEditOrAdd('addPage');" class="btn btn-primary pull-right voffset5"><fmt:message key="label.wiki.savechanges"></fmt:message></a> 
+                          <a href="javascript:cancelAdd();changeDiv('view');" class="btn btn-primary pull-right voffset5 roffset5"><fmt:message key="button.cancel"></fmt:message></a>
+
+                        </div>
+                      </div>
+
+
+
+                    </div>
+                  </div>
+                </div>
+                </html:form> 
+
+              <!-- Wiki pages folders -->
+              <h4>
+                <fmt:message key="label.wiki.pages"></fmt:message>
+              </h4>
+
+              <img src="<lams:WebAppURL />/images/tree_closed.gif" id="wikiListImage" 
+                   onclick="javascript:toggleWikiList('<lams:WebAppURL />')" />
+              &nbsp;
+              <a href="javascript:changeWikiPage('${fn:escapeXml(mainWikiPage.javaScriptTitle)}')">${fn:escapeXml(mainWikiPage.title)}</a>
+              <div id="wikiList" style="display:none;">
+                <c:forEach var="wikiPage" items="${wikiPages}">
+                  <c:if test="${wikiPage.title != mainWikiPage.title}">
+                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                    <a href="javascript:changeWikiPage('${fn:escapeXml(wikiPage.javaScriptTitle)}')">${fn:escapeXml(wikiPage.title)}</a>
+                    <br />
+                  </c:if> 
+                </c:forEach>
+              </div>                
+              <!-- end wiki pages folders -->
+
+
+              <div id="finishButtonDiv"></div>
+
+              <c:if test="${ (mode == 'learner' && minEditsReached ) || mode == 'author'}">
+                <%@ include file="parts/finishButton.jsp"%>
+                  </c:if>
+
+                </div>
+
+
+            </div><!-- end panel body -->
+          </div> <!-- end panel -->
+        </div>
+      </div> <!-- end row -->
+      </div> <!-- end content fluid -->
+
+
+    <script type="text/javascript">
+      <!--
+        var wikiLinkArray = new Array();
+      populateWikiLinkArray();
+      function populateWikiLinkArray()
+      {
+        <c:forEach var="wikiPage" items="${wikiPages}">
+          wikiLinkArray[wikiLinkArray.length] = '${fn:escapeXml(wikiPage.javaScriptTitle)}';
+      </c:forEach>
+      document.getElementById("wikiLinks").value = wikiLinkArray.toString();
+      }
+
+      displayMessageDiv();
+      function displayMessageDiv()
+      {
+        var messageDiv = document.getElementById("messageDiv");
+
+        if (trim(messageDiv.innerHTML) != "")
+        {
+          messageDiv.style.display="block";
+        }
+      }
+
+      function doEditOrAdd(dispatch)
+      {
+
+        var title="";
+        if(dispatch == "editPage")
+        {
+          title = document.getElementById("title").value;
+        }
+        else
+        {
+          title = document.getElementById("newPageTitle").value;
+        }
+
+        var i;
+
+        if (title == null || trim(title).length == 0)
+        {
+          alert("<fmt:message key='label.wiki.add.title.required'></fmt:message>");
+          return;
+        }
+
+        for (i=0; i<wikiLinkArray.length; i++)
+        {
+          if(dispatch == "editPage" && wikiLinkArray[i] == '${fn:escapeXml(currentWikiPage.javaScriptTitle)}')
+          {
+            continue;
+          }
+
+          if (trim(title) == wikiLinkArray[i])
+          {
+            alert("<fmt:message key='label.wiki.add.title.exists'><fmt:param>" + title + "</fmt:param></fmt:message>");
+            return;
+          }
+        }
+
+        // if all validation fulfilled, we can continue
+        document.getElementById("title").value = trim(title);
+        submitWiki(dispatch);
+      }
+
+      function submitWiki(dispatch)
+      {
+        document.getElementById("learningForm").action += "?dispatch=" + dispatch;
+        replaceJavascriptTokenAndSubmit("learningForm");
+      }
+
+
+      function hideToolbarItem(editorInstance, itemName) {
+
+        editorInstance.ui.items[itemName].setState(CKEDITOR.TRISTATE_DISABLED);
+        /*
 			toolbarItem = editorInstance.EditorWindow.parent.FCKToolbarItems.LoadedItems[itemName]._UIButton.MainElement;
 			toolbarItem.style.display = 'none';
 		*/
-	}
+      }
 
-	CKEDITOR.on('instanceCreated',function (editorInstance) 
-	{ 	
-		if (!${wikiDTO.allowLearnerAttachImages}) {	
-			hideToolbarItem(editorInstance, 'Image');
-		}
-		if (!${wikiDTO.allowLearnerInsertLinks}) {	
-			hideToolbarItem(editorInstance, 'Link');
-		}
-		
-		editorInstance.wikiLinkArray = wikiLinkArray;
-	});
-	
-	function refreshPage()
-	{
-		var url = "<lams:WebAppURL/>/learning.do?mode=${mode}&toolSessionID=${lrnForm.toolSessionID}&currentWikiPageId=${currentWikiPage.uid}"
-		window.location=url;
-	}
+      CKEDITOR.on('instanceCreated',function (editorInstance) 
+                  { 	
+        if (!${wikiDTO.allowLearnerAttachImages}) {	
+          hideToolbarItem(editorInstance, 'Image');
+        }
+        if (!${wikiDTO.allowLearnerInsertLinks}) {	
+          hideToolbarItem(editorInstance, 'Link');
+        }
 
--->
-</script>
+        editorInstance.wikiLinkArray = wikiLinkArray;
+      });
+
+      function refreshPage()
+      {
+        var url = "<lams:WebAppURL/>/learning.do?mode=${mode}&toolSessionID=${lrnForm.toolSessionID}&currentWikiPageId=${currentWikiPage.uid}"
+        window.location=url;
+      }
+
+      -->
+    </script>
+    <script type="text/javascript">
+
+      jQuery(document).ready(function() {
+        jQuery("time.timeago").timeago();
+      });
+    </script>
\ No newline at end of file