Index: lams_tool_sbmt/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r51902e5ec7e5e92493bdd4c6e58e211142b5f42e -r61318ef54f452cbbc30e67ef3254ca49eda6551c
--- lams_tool_sbmt/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 51902e5ec7e5e92493bdd4c6e58e211142b5f42e)
+++ lams_tool_sbmt/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 61318ef54f452cbbc30e67ef3254ca49eda6551c)
@@ -162,6 +162,7 @@
 outcome.authoring.remove.confirm = Are you sure you want to remove this learning outcome?
 label.enable.min.limit = Set minimum number of files to upload
 label.should.upload.another = Minimum number of files to be uploaded: {0}
+label.min.limit.preview = Since you are a teacher in the preview mode, you can finish the activity without uploading sufficient files. 
 outcome.authoring.create.new = [create new]
 label.monitoring.change.leader = Change leader
 label.monitoring.leader.successfully.changed = Leader changed
Index: lams_tool_sbmt/web/learner/sbmtlearner.jsp
===================================================================
diff -u -rdd5c84eb549864bb1a78b615cc7c382df3bc1c25 -r61318ef54f452cbbc30e67ef3254ca49eda6551c
--- lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision dd5c84eb549864bb1a78b615cc7c382df3bc1c25)
+++ lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision 61318ef54f452cbbc30e67ef3254ca49eda6551c)
@@ -17,6 +17,11 @@
 	
 	<link href="/lams/css/uppy.min.css"    rel="stylesheet" type="text/css" />
 	<link href="/lams/css/uppy.custom.css" rel="stylesheet" type="text/css" />
+	<style>
+		.btn-hide-on-min-not-met {
+			display: none;
+		}
+	</style>
 	
 	<script type="text/javascript" src="${lams}/includes/javascript/uppy/uppy.min.js"></script>
 	<c:choose>
@@ -49,6 +54,13 @@
 				initFileUpload('${learnerForm.tmpFileUploadId}', '${language}');
 			}
 
+			<c:if test="${sessionMap.mode != 'author' and sessionMap.minLimitUploadNumber != null}">
+				var uploadedFilesNumber = +${learner.filesUploaded.size()};
+				if (uploadedFilesNumber >= ${sessionMap.minLimitUploadNumber}) {
+					$('.btn-hide-on-min-not-met').removeClass('btn-hide-on-min-not-met');
+				}
+			</c:if>
+
 			<%-- Connect to command websocket only if it is learner UI --%>
 			<c:if test="${isLeadershipEnabled and sessionMap.mode == 'learner'}">
 				// command websocket stuff for refreshing
@@ -159,8 +171,13 @@
 			//enforce min files upload limit
 			<c:if test="${sessionMap.minLimitUploadNumber != null}">
 				if (uploadedFilesNumber < ${sessionMap.minLimitUploadNumber}) {
-					alert('<fmt:message key="label.should.upload.another"><fmt:param value="${sessionMap.minLimitUploadNumber}" /></fmt:message>');
-					return false;
+					if (${sessionMap.mode eq 'author'}) {
+						alert('<fmt:message key="label.should.upload.another"><fmt:param value="${sessionMap.minLimitUploadNumber}" /></fmt:message>' + 
+							  '\n<fmt:message key="label.min.limit.preview"/>');
+					} else {
+						alert('<fmt:message key="label.should.upload.another"><fmt:param value="${sessionMap.minLimitUploadNumber}" /></fmt:message>');
+						return false;
+					}
 				}
 			</c:if>
 
@@ -306,6 +323,55 @@
 		</c:if>
 		<lams:errors/>
 
+		<!-- upload form (we display it only if the user is not finished and lockedWhenFinished or no more files allowed) -->
+		<c:if test="${!sessionMap.finishLock && !sessionMap.maxLimitReached && hasEditRight && sessionMap.mode != 'teacher'}">
+			<form:form action="uploadFile.do" modelAttribute="learnerForm" id="learnerForm" method="post" enctype="multipart/form-data" onsubmit="return validateFileUpload();" >
+				<input type="hidden" name="sessionMapID" value="${sessionMapID}"/>
+				<input type="hidden" name="toolSessionID" value="${toolSessionID}" />
+				<input type="hidden" name="tmpFileUploadId" value="${learnerForm.tmpFileUploadId}" />
+				
+				<!--File path row -->
+				<div class="panel panel-default">
+					<div class="panel-heading panel-title">
+						<fmt:message key="label.learner.upload" />
+					</div>
+					
+					<div class="panel-body bg-success">
+						<div class="form-group">
+							<label for="file-upload-area"><fmt:message key="label.learner.filePath" />&nbsp;<span style="color: red">*</span></label>
+							
+							<div id="file-upload-area" class="voffset20"></div>
+						</div>
+						
+						<!--File Description -->
+						<div class="form-group">	
+							<label for="description"><fmt:message key="label.learner.fileDescription" />&nbsp;<span
+								style="color: red">*</span></label>
+							<form:textarea id="description" cssClass="form-control" path="description"></form:textarea>
+							<div id="desc-error-msg" class="text-danger" style="display: none;"></div>
+						</div>
+						
+						<p class="help-block"><small><fmt:message key="errors.required"><fmt:param>*</fmt:param></fmt:message></small></p>
+						
+							<c:if test="${hasEditRight}">
+								<div class="form-group text-center">
+									<button id="uploadButton" type="submit" <c:if test="${sessionMap.finishLock || sessionMap.maxLimitReached}">disabled="disabled"</c:if>
+										class="btn btn-default btn-success btn-disable-on-submit"
+										title='<fmt:message key="label.add.tip" />' >
+										<i class="fa fa-xs fa-plus"></i> <fmt:message key="label.add" />
+									</button>
+								</div>
+							</c:if>
+						
+					</div>
+				</div>
+			</form:form>
+				
+			<lams:WaitingSpinner id="attachmentArea_Busy"/>
+			
+			<hr width="100%"/>
+		</c:if>
+		
 		<!--Checks if the filesUploaded property of the SbmtLearnerForm is set -->
 		<c:choose>
 			<c:when test="${empty learner.filesUploaded && hasEditRight}">
@@ -401,55 +467,6 @@
 				</table>
 			</c:otherwise>
 		</c:choose>
-
-		<hr width="100%"/>
-
-		<!-- upload form (we display it only if the user is not finished and lockedWhenFinished or no more files allowed) -->
-		<c:if test="${!sessionMap.finishLock && !sessionMap.maxLimitReached && hasEditRight && sessionMap.mode != 'teacher'}">
-			<form:form action="uploadFile.do" modelAttribute="learnerForm" id="learnerForm" method="post" enctype="multipart/form-data" onsubmit="return validateFileUpload();" >
-				<input type="hidden" name="sessionMapID" value="${sessionMapID}"/>
-				<input type="hidden" name="toolSessionID" value="${toolSessionID}" />
-				<input type="hidden" name="tmpFileUploadId" value="${learnerForm.tmpFileUploadId}" />
-				
-				<!--File path row -->
-				<div class="panel panel-default">
-					<div class="panel-heading panel-title">
-						<fmt:message key="label.learner.upload" />
-					</div>
-					
-					<div class="panel-body bg-success">
-						<div class="form-group">
-							<label for="file-upload-area"><fmt:message key="label.learner.filePath" />&nbsp;<span style="color: red">*</span></label>
-							
-							<div id="file-upload-area" class="voffset20"></div>
-						</div>
-						
-						<!--File Description -->
-						<div class="form-group">	
-							<label for="description"><fmt:message key="label.learner.fileDescription" />&nbsp;<span
-								style="color: red">*</span></label>
-							<form:textarea id="description" cssClass="form-control" path="description"></form:textarea>
-							<div id="desc-error-msg" class="text-danger" style="display: none;"></div>
-						</div>
-						
-						<p class="help-block"><small><fmt:message key="errors.required"><fmt:param>*</fmt:param></fmt:message></small></p>
-						
-							<c:if test="${hasEditRight}">
-								<div class="form-group text-center">
-									<button id="uploadButton" type="submit" <c:if test="${sessionMap.finishLock || sessionMap.maxLimitReached}">disabled="disabled"</c:if>
-										class="btn btn-default btn-success btn-disable-on-submit"
-										title='<fmt:message key="label.add.tip" />' >
-										<i class="fa fa-xs fa-plus"></i> <fmt:message key="label.add" />
-									</button>
-								</div>
-							</c:if>
-						
-					</div>
-				</div>
-			</form:form>
-				
-			<lams:WaitingSpinner id="attachmentArea_Busy"/>
-		</c:if>
 		
 		<!-- reflection -->
 
@@ -494,12 +511,15 @@
 		<c:if test="${sessionMap.mode != 'teacher'}">
 			<c:choose>
 				<c:when test="${sessionMap.reflectOn and (not sessionMap.userFinished)}">
-					<button id="notebookButton" onclick="javascript:notebook();" class="btn btn-primary btn-disable-on-submit pull-right">
+					<button id="notebookButton" onclick="javascript:notebook();"
+							class="btn btn-primary btn-disable-on-submit pull-right ${sessionMap.mode eq 'author' ? '' : 'btn-hide-on-min-not-met'}">
 						<fmt:message key="label.continue" />
 					</button>
 				</c:when>
 				<c:otherwise>
-					<button type="button" class="btn btn-primary btn-disable-on-submit pull-right na" id="finishButton">
+					<button type="button" 
+							class="btn btn-primary btn-disable-on-submit pull-right na ${sessionMap.mode eq 'author' ? '' : 'btn-hide-on-min-not-met'}"
+							id="finishButton">
 						<c:choose>
 							<c:when test="${isLastActivity}">
 								<fmt:message key="button.submit" />