Index: lams_tool_sbmt/web/learner/sbmtlearner.jsp
===================================================================
diff -u -ra71bf2630935c6bc8b907ca22801208a2d3bd657 -r1688016bbb43db756bca9b93361c2a3833089d12
--- lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision a71bf2630935c6bc8b907ca22801208a2d3bd657)
+++ lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision 1688016bbb43db756bca9b93361c2a3833089d12)
@@ -7,7 +7,9 @@
 <c:set var="UPLOAD_FILE_MAX_SIZE_AS_USER_STRING"><%=FileValidatorUtil.formatSize(Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_MAX_SIZE))%></c:set>
 <c:set var="EXE_FILE_TYPES"><%=Configuration.get(ConfigurationKeys.EXE_EXTENSIONS)%></c:set>
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
-
+<c:set var="isUserLeader" value="${sessionMap.isUserLeader}"/>
+<c:set var="isLeadershipEnabled" value="${sessionMap.useSelectLeaderToolOuput}"/>
+<c:set var="hasEditRight" value="${sessionMap.hasEditRight}"/>
 <lams:html>
 <lams:head>
 	<title><fmt:message key="tool.display.name" /></title>
@@ -126,7 +128,7 @@
 		</div>
 
 		<!-- notices and announcements -->
-		<c:if test="${sessionMap.mode == 'author' || sessionMap.mode == 'learner'}">
+		<c:if test="${(sessionMap.mode == 'author' || sessionMap.mode == 'learner') && hasEditRight}">
 			<c:if test="${sessionMap.lockOnFinish}">
 				<!--  Lock when finished -->
 				<lams:Alert id="lockWhenFinished" type="info" close="true">
@@ -171,8 +173,7 @@
 
 		<!--Checks if the filesUploaded property of the SbmtLearnerForm is set -->
 		<c:choose>
-
-			<c:when test="${empty learner.filesUploaded}">
+			<c:when test="${empty learner.filesUploaded && hasEditRight}">
 				<div class="alert">
 					<fmt:message key="label.learner.noUpload" />
 				</div>
@@ -200,7 +201,7 @@
 								</c:set>
 								</td>
 								<td>
-								<c:if test="${empty file.marks}">
+								<c:if test="${empty file.marks && hasEditRight}">
 								 <html:link href="javascript:deleteLearnerFile(${file.submissionID});" styleClass="btn btn-default btn-disable-on-submit pull-right">
 					                      <i class="fa fa-trash" title="<fmt:message key="label.monitoring.original.learner.file.delete" />"></i> <span class="hidden-xs"></span>
 				                 </html:link>
@@ -282,7 +283,7 @@
 			<!-- now check if the user is (finished + lockedWhenFinished) or no more files allowed -->
 			<c:set var="displayForm" value="${sessionMap.finishLock || sessionMap.arriveLimit}" />
 
-			<c:if test="${!displayForm}">
+			<c:if test="${!displayForm && hasEditRight}">
 
 				<html:form action="/learner?method=uploadFile" method="post" enctype="multipart/form-data" onsubmit="return validate();" >
 					<html:hidden property="sessionMapID" />
@@ -311,10 +312,12 @@
 							</div>
 							<p class="help-block"><small><fmt:message key="errors.required"><fmt:param>*</fmt:param></fmt:message></small></p>
 							<div class="form-group">
-								<button id="uploadButton" type="submit" <c:if test="${sessionMap.finishLock || sessionMap.arriveLimit}">disabled="disabled"</c:if>
-									class="btn btn-sm btn-default btn-primary btn-disable-on-submit">
-									<i class="fa fa-xs fa-plus"></i> <fmt:message key="label.add" />
-								</button>
+								<c:if test="${hasEditRight}">											
+									<button id="uploadButton" type="submit" <c:if test="${sessionMap.finishLock || sessionMap.arriveLimit}">disabled="disabled"</c:if>
+										class="btn btn-sm btn-default btn-primary btn-disable-on-submit">
+										<i class="fa fa-xs fa-plus"></i> <fmt:message key="label.add" />
+									</button>
+								</c:if>
 							</div>
 						</div>
 					</div>