Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtConstants.java
===================================================================
diff -u -re34c7b767eb34caebbfa0c9bdfb50d771d3b9d95 -r4654c7f895cb17f331b95703cedca34e1ab106be
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtConstants.java	(.../SbmtConstants.java)	(revision e34c7b767eb34caebbfa0c9bdfb50d771d3b9d95)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtConstants.java	(.../SbmtConstants.java)	(revision 4654c7f895cb17f331b95703cedca34e1ab106be)
@@ -93,10 +93,6 @@
     
     public static final String ATTR_SUBMIT_FILES = "submittedFilesMap";
     
-    public static final String WAIT_FOR_LEADER = "waitForLeader";
-    
-    public static final String WAIT_FOR_LEADER_TIME_LIMIT = "waitForLeaderTimeLimit";
-    
     public static final String ATTR_IS_USER_LEADER = "isUserLeader";
     
     public static final String ATTR_HAS_EDIT_RIGHT = "hasEditRight";
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearningController.java
===================================================================
diff -u -r5c1bac8c09133d94e7134da9b42e6652a51c15bd -r4654c7f895cb17f331b95703cedca34e1ab106be
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearningController.java	(.../LearningController.java)	(revision 5c1bac8c09133d94e7134da9b42e6652a51c15bd)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearningController.java	(.../LearningController.java)	(revision 4654c7f895cb17f331b95703cedca34e1ab106be)
@@ -28,7 +28,6 @@
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
-import java.util.SortedMap;
 import java.util.TimeZone;
 
 import javax.servlet.ServletException;
@@ -199,8 +198,6 @@
 		    IEventNotificationService.DELIVERY_METHOD_MAIL);
 	}
 
-	SortedMap<SubmitUserDTO, List<FileDetailsDTO>> submittedFilesMap = submitFilesService
-		.getFilesUploadedBySession(toolSessionID, request.getLocale());
 	// support for leader select feature
 	SubmitUser groupLeader = content.isUseSelectLeaderToolOuput()
 		? submitFilesService.checkLeaderSelectToolForSessionLeader(learner, toolSessionID)
@@ -210,11 +207,8 @@
 
 	    // forwards to the leaderSelection page
 	    if (groupLeader == null) {
-		List<SubmitUser> groupUsers = submitFilesService.getUsersBySession(toolSessionID);
-		request.setAttribute(SbmtConstants.ATTR_GROUP_USERS, groupUsers);
-		request.setAttribute(SbmtConstants.ATTR_SUBMIT_FILES, submittedFilesMap);
 		request.setAttribute(SbmtConstants.PARAM_WAITING_MESSAGE_KEY, "label.waiting.for.leader");
-		return "learner/waitForLeaderTimeLimit";
+		return "learner/waitforleader";
 	    }
 
 	    // forwards to the waitForLeader pages
@@ -227,13 +221,13 @@
 		if (filesUploadedByLeader == null) {
 		    request.setAttribute(SbmtConstants.PARAM_WAITING_MESSAGE_KEY,
 			    "label.waiting.for.leader.launch.time.limit");
-		    return "learner/waitForLeaderTimeLimit";
+		    return "learner/waitforleader";
 		}
 
 		//if the time is up and leader hasn't submitted response - show waitForLeaderFinish page
 		if (!groupLeader.isFinished()) {
 		    request.setAttribute(SbmtConstants.PARAM_WAITING_MESSAGE_KEY, "label.waiting.for.leader.finish");
-		    return "learner/waitForLeaderTimeLimit";
+		    return "learner/waitforleader";
 		}
 	    }
 
Fisheye: Tag 4654c7f895cb17f331b95703cedca34e1ab106be refers to a dead (removed) revision in file `lams_tool_sbmt/web/learner/waitForLeaderTimeLimit.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_sbmt/web/learner/waitforleader.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r4654c7f895cb17f331b95703cedca34e1ab106be
--- lams_tool_sbmt/web/learner/waitforleader.jsp	(.../waitforleader.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_sbmt/web/learner/waitforleader.jsp	(.../waitforleader.jsp)	(revision 4654c7f895cb17f331b95703cedca34e1ab106be)
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <%@ include file="/common/taglibs.jsp"%>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
 <lams:html>
 <lams:head>
@@ -19,35 +20,21 @@
 </lams:head>
 <body class="stripes">
 
-	<lams:Page type="learner" title="${content.title}">
+	<lams:Page type="learner" title="${sessionMap.title}">
 	
-				
-		<c:if test="${isLeadershipEnabled}">
-			<lams:LeaderDisplay username="${sessionMap.groupLeader.firstName} ${sessionMap.groupLeader.lastName}" userId="${sessionMap.groupLeader.userId}"/>
-		</c:if>
-	
-		
+		<div class="panel">
+			<c:out value="${sessionMap.instruction}" escapeXml="false" />
+		</div>
+
 		<h4>
-			<fmt:message key="label.waiting.for.leader" />
+			<fmt:message key="${waitingMessageKey}" />
 		</h4>
-
-		<div>
-			<fmt:message key="label.users.from.group" />
-		</div>
 		
-		<div>
-			<c:forEach var="user" items="${groupUsers}" varStatus="status">
-				<div class="user">
-					<c:out value="${user.firstName}" escapeXml="true"/> <c:out value="${user.lastName}" escapeXml="true"/>
-				</div>
-			</c:forEach>
-		</div>
-		
 		<button name="refreshButton" onclick="refresh();" class="btn btn-sm btn-primary pull-right">
 			<fmt:message key="label.refresh" />
 		</button>
 
 	</lams:Page>
 
 </body>
-</lams:html>
+</lams:html>
\ No newline at end of file