Index: lams_tool_notebook/web/pages/learning/submissionDeadline.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/learning/submissionDeadline.jsp,v
diff -u -r1.2 -r1.2.2.1
--- lams_tool_notebook/web/pages/learning/submissionDeadline.jsp	27 Mar 2014 00:00:06 -0000	1.2
+++ lams_tool_notebook/web/pages/learning/submissionDeadline.jsp	23 Feb 2016 17:20:57 -0000	1.2.2.1
@@ -4,43 +4,40 @@
 	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="${notebookDTO.title}" escapeXml="true"/>
-	</h1>
+<lams:Page type="learner" title="${notebookDTO.title}">
 
-	<div class="warning">
-		<fmt:message key="authoring.info.teacher.set.restriction" >
-			<fmt:param><lams:Date value="${notebookDTO.submissionDeadline}" /></fmt:param>
-		</fmt:message>	
-	</div>
-	
+	<!-- Announcements and advanced settings -->
+	<lams:Alert id="submissionDeadline" type="danger" close="false">
+		<fmt:message key="authoring.info.teacher.set.restriction">
+			<fmt:param>
+				<lams:Date value="${notebookDTO.submissionDeadline}" />
+			</fmt:param>
+		</fmt:message>
+	</lams:Alert>
+	<!-- End announcements and advanced settings -->
+
 	<c:if test="${mode == 'learner' || mode == 'author'}">
 		<html:form action="/learning" method="post" onsubmit="disableFinishButton();" styleId="messageForm">
 			<html:hidden property="dispatch" value="finishActivity" />
 			<html:hidden property="toolSessionID" />
 
-			<div align="right" class="space-bottom-top">
-				<html:link href="#nogo" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
-					<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>
+			<html:link href="#nogo" styleClass="btn btn-primary pull-right voffset10 na" styleId="finishButton"
+				onclick="submitForm('finish')">
+				<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>
 		</html:form>
 	</c:if>
-</div>
-
+</lams:Page>