Index: lams_tool_laqa/web/learning/mobile/LearnerRep.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/mobile/LearnerRep.jsp,v
diff -u -r1.9 -r1.10
--- lams_tool_laqa/web/learning/mobile/LearnerRep.jsp	6 Jun 2013 14:40:53 -0000	1.9
+++ lams_tool_laqa/web/learning/mobile/LearnerRep.jsp	8 Jan 2014 17:50:54 -0000	1.10
@@ -10,6 +10,10 @@
 	<lams:WebAppURL />
 </c:set>
 <c:set var="sessionMap" value="${sessionScope[generalLearnerFlowDTO.httpSessionID]}" />
+<c:set var="isUserLeader" value="${sessionMap.isUserLeader}" />
+<c:set var="mode" value="${sessionMap.mode}" />
+<c:set var="isLeadershipEnabled" value="${sessionMap.content.useSelectLeaderToolOuput}" />
+<c:set var="hasEditRight" value="${!isLeadershipEnabled || isLeadershipEnabled && isUserLeader}" />
 
 <lams:html>
 <lams:head>
@@ -122,6 +126,14 @@
 				</fmt:message>
 			</div>
 		</c:if>
+				
+		<c:if test="${isLeadershipEnabled}">
+			<h4>
+				<fmt:message key="label.group.leader" >
+					<fmt:param>${sessionMap.groupLeader.fullname}</fmt:param>
+				</fmt:message>
+			</h4>
+		</c:if>
 		
 		<h2 class="space-bottom">
 			<fmt:message key="label.learnerReport" />
@@ -135,7 +147,7 @@
 			
 			<c:if test="${generalLearnerFlowDTO.requestLearningReportProgress != 'true'}">
 				<c:choose>
-					<c:when test="${generalLearnerFlowDTO.reflection != 'true'}">
+					<c:when test="${(generalLearnerFlowDTO.reflection != 'true') || !hasEditRight}">
 						<html:hidden property="method" value="endLearning"/>
 					</c:when>
 					<c:otherwise>
@@ -286,7 +298,7 @@
 						<fmt:message key="label.refresh" />
 					</button>
 	
-					<c:if test="${generalLearnerFlowDTO.lockWhenFinished != 'true'}">
+					<c:if test="${(generalLearnerFlowDTO.lockWhenFinished != 'true') && hasEditRight}">
 						<button name="redoQuestions" onclick="submitMethod('redoQuestions');" data-icon="back">
 							<fmt:message key="label.redo" />
 						</button>
@@ -300,7 +312,7 @@
 		<c:if test="${generalLearnerFlowDTO.requestLearningReportViewOnly != 'true' }">
 			<c:if test="${generalLearnerFlowDTO.teacherViewOnly != 'true' }">
 				<span class="ui-finishbtn-right">
-					<c:if test="${generalLearnerFlowDTO.reflection != 'true'}">
+					<c:if test="${(generalLearnerFlowDTO.reflection != 'true') || !hasEditRight}">
 						<a href="#nogo" name="endLearning" id="finishButton" onclick="javascript:submitMethod('endLearning');" data-role="button" data-icon="arrow-r" data-theme="b">
 							<span class="nextActivity">
 								<c:choose>
@@ -315,7 +327,7 @@
 						</a>
 					</c:if>
 
-					<c:if test="${generalLearnerFlowDTO.reflection == 'true'}">
+					<c:if test="${(generalLearnerFlowDTO.reflection == 'true') && hasEditRight}">
 						<button name="forwardtoReflection"	onclick="javascript:submitMethod('forwardtoReflection');" data-icon="arrow-r" data-theme="b">
 							<fmt:message key="label.continue" />
 						</button>