Index: lams_tool_bbb/web/pages/learning/learning.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_bbb/web/pages/learning/learning.jsp,v
diff -u -r1.2 -r1.2.2.1
--- lams_tool_bbb/web/pages/learning/learning.jsp	27 Mar 2014 14:09:02 -0000	1.2
+++ lams_tool_bbb/web/pages/learning/learning.jsp	26 Feb 2016 17:11:34 -0000	1.2.2.1
@@ -9,26 +9,26 @@
 	}
 
 	function validateForm() {
-	
+
 		// Validates that there's input from the user. 
-		
+
 		// disables the Finish button to avoid double submittion 
 		disableFinishButton();
 
- 		if (mode == "learner") {
+		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 (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;      
+					return false;
 				}
 			} else {
 				// there was something on the form, so submit the form
@@ -37,51 +37,56 @@
 		}
 	}
 
--->
+	-->
 </script>
 
-<div id="content">
-	<h1>
-		<c:out value="${contentDTO.title}" escapeXml="true"/>
-	</h1>
+<lams:Page type="learner" title="${contentDTO.title}">
+	<div class="panel">
+		<c:out value="${contentDTO.instructions}" escapeXml="false" />
+	</div>
 
-	<p>
-		<c:out value="${contentDTO.instructions}" escapeXml="false"/>
-	</p>
-
 	<c:if test="${contentDTO.lockOnFinish and mode == 'learner'}">
-		<div class="info">
+		<lams:Alert id="lockWhenFinished" type="info" close="true">
 			<c:choose>
-				<c:when test="${finishedActivity}">
+				<c:when test="${userDTO.finishedActivity}">
 					<fmt:message key="message.activityLocked" />
 				</c:when>
 				<c:otherwise>
 					<fmt:message key="message.warnLockOnFinish" />
 				</c:otherwise>
 			</c:choose>
-		</div>
+		</lams:Alert>
 	</c:if>
 
-	<p>
-		<c:choose>
-			<c:when test="${meetingOpen}">
-				<html:link href="${meetingURL}" target="bbbLearner${toolSessionID}" onclick="window.open('${meetingURL}', 'bbbLearner${toolSessionID}', 'resizable=yes,scrollbars=yes')">
-					<fmt:message key="label.learning.joinConference" />
-				</html:link>
-			</c:when>
-			<c:otherwise>
-				<p>
-					<fmt:message key="label.learning.conferenceNotAvailable" />
-				</p>
-				<html:link href="#" onclick="window.location.reload()">
-					<fmt:message key="label.refresh" />
-				</html:link>
-			</c:otherwise>
-		</c:choose>
-	</p>
+	<c:set var="allowAccess" value="true" />
+	<c:if test="${contentDTO.lockOnFinish && userDTO.finishedActivity && mode == 'learner'}">
+		<c:set var="allowAccess" value="false" />
+	</c:if>
 
+	<div class="buttons">
+			<c:choose>
+				<c:when test="${meetingOpen && allowAccess}">
+					<html:link styleClass="btn btn-success" href="${meetingURL}" target="bbbLearner${toolSessionID}"
+						onclick="window.open('${meetingURL}', 'bbbLearner${toolSessionID}', 'resizable=yes,scrollbars=yes')">
+						<fmt:message key="label.learning.joinConference" />
+					</html:link>
+				</c:when>
+				<c:otherwise>
+					<p>
+						<fmt:message key="label.learning.conferenceNotAvailable" />
+					</p>
+					<html:link styleClass="btn btn-sm btn-default" href="#" onclick="window.location.reload()">
+						<fmt:message key="label.refresh" />
+					</html:link>
+				</c:otherwise>
+			</c:choose>
+
+	</div>
+
+	<hr class="msg-hr">
+
 	<c:if test="${mode == 'learner' || mode == 'author'}">
 		<%@ include file="parts/finishButton.jsp"%>
 	</c:if>
 
-</div>
+</lams:Page>