Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
===================================================================
diff -u -rfd72af2c8d69fd4c43790f58b2ff7f0db72ca58b -r79db1b495adba49dd54a6250c1221a326f153633
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java	(.../LearningController.java)	(revision fd72af2c8d69fd4c43790f58b2ff7f0db72ca58b)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java	(.../LearningController.java)	(revision 79db1b495adba49dd54a6250c1221a326f153633)
@@ -1222,6 +1222,7 @@
     @RequestMapping("/showResultsForTeacher")
     public String showResultsForTeacher(HttpServletRequest request) {
 	long toolContentId = WebUtil.readLongParam(request, AssessmentConstants.PARAM_TOOL_CONTENT_ID);
+	boolean embedded = WebUtil.readBooleanParam(request, "embedded", false);
 	UserDTO user = LearningController.getCurrentUser();
 	Lesson lesson = lessonService.getLessonByToolContentId(toolContentId);
 
@@ -1273,7 +1274,7 @@
 	sessionMap.put(AssessmentConstants.CONFIG_KEY_HIDE_TITLES,
 		Boolean.valueOf(service.getConfigValue(AssessmentConstants.CONFIG_KEY_HIDE_TITLES)));
 
-	return "pages/learning/results";
+	return "pages/learning/results" + (embedded ? "/allquestions" : "");
     }
 
     /**
Index: lams_tool_assessment/web/pages/learning/results.jsp
===================================================================
diff -u -rfd72af2c8d69fd4c43790f58b2ff7f0db72ca58b -r79db1b495adba49dd54a6250c1221a326f153633
--- lams_tool_assessment/web/pages/learning/results.jsp	(.../results.jsp)	(revision fd72af2c8d69fd4c43790f58b2ff7f0db72ca58b)
+++ lams_tool_assessment/web/pages/learning/results.jsp	(.../results.jsp)	(revision 79db1b495adba49dd54a6250c1221a326f153633)
@@ -8,25 +8,6 @@
 	<%@ include file="/common/header.jsp"%>
 	<lams:css suffix="jquery.jRating"/>
 	
-	<link rel="stylesheet" type="text/css" href="${lams}css/bootstrap-slider.css" />
-	<style>
-		tr.selected-by-groups td {
-			border-top: none !important;
-		}
-		
-		tr.selected-by-groups span {
-			font-weight: bold;
-		}
-		.slider.slider-horizontal {
-			margin-left: 40px;
-		}
-	</style>
-	
-	<c:set var="localeLanguage"><lams:user property="localeLanguage" /></c:set>
-	<script type="text/javascript" src="${lams}includes/javascript/jquery.timeago.js"></script> 
-	<script type="text/javascript" src="${lams}includes/javascript/timeagoi18n/jquery.timeago.${fn:toLowerCase(localeLanguage)}.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/bootstrap-slider.js"></script>
-
 	<%-- param has higher level for request attribute --%>
 	<c:if test="${not empty param.sessionMapID}">
 		<c:set var="sessionMapID" value="${param.sessionMapID}" />
@@ -41,47 +22,8 @@
 	<c:set var="result" value="${sessionMap.assessmentResult}" />
 	<c:set var="isUserLeader" value="${sessionMap.isUserLeader}"/>
 	<c:set var="isLeadershipEnabled" value="${assessment.useSelectLeaderToolOuput}"/>
-	
 		
 	<script type="text/javascript">
-		//var for jquery.jRating.js
-		var pathToImageFolder = "${lams}images/css/",
-		
-		//vars for rating.js
-			AVG_RATING_LABEL = '<fmt:message key="label.average.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param></fmt:message>',
-			YOUR_RATING_LABEL = '<fmt:message key="label.your.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param><fmt:param>@3@</fmt:param></fmt:message>',
-			COMMENTS_MIN_WORDS_LIMIT = 0,
-			MAX_RATES = 0,
-			MIN_RATES = 0,
-			LAMS_URL = '${lams}',
-			COUNT_RATED_ITEMS = true,
-			COMMENT_TEXTAREA_TIP_LABEL = '<fmt:message key="label.comment.textarea.tip"/>',
-			WARN_COMMENTS_IS_BLANK_LABEL = '<fmt:message key="error.resource.image.comment.blank"/>',
-			ALLOW_RERATE = false;
-		<c:if test="${not empty toolSessionID}">
-			var SESSION_ID = ${toolSessionID};
-		</c:if>
-
-	</script>
-	<script type="text/javascript" src="${lams}includes/javascript/rating.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/jquery.jRating.js"></script>
-	
-	<script type="text/javascript">
-		$(document).ready(function() {
-			$("time.timeago").timeago();
-
-			//initialize bootstrap-sliders if "Enable confidence level" option is ON
-			$('.bootstrap-slider').bootstrapSlider();
-
-			// command websocket stuff for refreshing
-			// trigger is an unique ID of page and action that command websocket code in Page.tag recognises
-			commandWebsocketHookTrigger = 'assessment-results-refresh-${assessment.contentId}';
-			// if the trigger is recognised, the following action occurs
-			commandWebsocketHook = function() {
-				location.reload();
-			};
-		});
-
 		function disableButtons() {
 			$('.btn').prop('disabled',true);
 		}
@@ -107,15 +49,6 @@
 			document.location.href ="<c:url value='/learning/resubmit.do?sessionMapID=${sessionMapID}'/>";
 			return false;			
 		}
-		
-		function refreshToRating(questionUid) {
-			// LDEV-5052 Refresh page and scroll to the given ID on comment submit
-
-			// setting href does not navigate if url contains #, we still need a reload
-			location.hash = '#rating-table-' + questionUid;
-			location.reload();
-			return false;
-		}
     </script>
 </lams:head>
 <body class="stripes">
Index: lams_tool_assessment/web/pages/learning/results/allquestions.jsp
===================================================================
diff -u -r21c27a799a8473c3a8844258ac269683831db33e -r79db1b495adba49dd54a6250c1221a326f153633
--- lams_tool_assessment/web/pages/learning/results/allquestions.jsp	(.../allquestions.jsp)	(revision 21c27a799a8473c3a8844258ac269683831db33e)
+++ lams_tool_assessment/web/pages/learning/results/allquestions.jsp	(.../allquestions.jsp)	(revision 79db1b495adba49dd54a6250c1221a326f153633)
@@ -1,8 +1,112 @@
 <%@ include file="/common/taglibs.jsp"%>
+
+<c:set var="lams"><lams:LAMSURL /></c:set>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+<c:set var="assessment" value="${sessionMap.assessment}" />
+<c:set var="pageNumber" value="${sessionMap.pageNumber}" />
+<c:set var="hasEditRight" value="${sessionMap.hasEditRight}"/>
+<c:set var="isUserLeader" value="${sessionMap.isUserLeader}"/>
+<c:set var="isLeadershipEnabled" value="${assessment.useSelectLeaderToolOuput}"/>
+<c:set var="localeLanguage"><lams:user property="localeLanguage" /></c:set>
+
+<c:if test="${param.embedded}">
+	<lams:css suffix="jquery.jRating"/>
+	<link href="<lams:WebAppURL/>includes/css/assessment.css" rel="stylesheet" type="text/css">
+</c:if>
+
+<link rel="stylesheet" type="text/css" href="${lams}css/bootstrap-slider.css" />
+<style>
+	tr.selected-by-groups td {
+		border-top: none !important;
+	}
+	
+	tr.selected-by-groups span {
+		font-weight: bold;
+	}
+	.slider.slider-horizontal {
+		margin-left: 40px;
+	}
+</style>
+	
+<script type="text/javascript" src="${lams}includes/javascript/jquery.timeago.js"></script> 
+<script type="text/javascript" src="${lams}includes/javascript/timeagoi18n/jquery.timeago.${fn:toLowerCase(localeLanguage)}.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/bootstrap-slider.js"></script>
+<script type="text/javascript">
+	//var for jquery.jRating.js
+	var pathToImageFolder = "${lams}images/css/",
+	
+	//vars for rating.js
+		AVG_RATING_LABEL = '<fmt:message key="label.average.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param></fmt:message>',
+		YOUR_RATING_LABEL = '<fmt:message key="label.your.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param><fmt:param>@3@</fmt:param></fmt:message>',
+		COMMENTS_MIN_WORDS_LIMIT = 0,
+		MAX_RATES = 0,
+		MIN_RATES = 0,
+		LAMS_URL = '${lams}',
+		COUNT_RATED_ITEMS = true,
+		COMMENT_TEXTAREA_TIP_LABEL = '<fmt:message key="label.comment.textarea.tip"/>',
+		WARN_COMMENTS_IS_BLANK_LABEL = '<fmt:message key="error.resource.image.comment.blank"/>',
+		ALLOW_RERATE = false;
+	<%-- Do not allow rating if it is a teacher view --%>
+	<c:if test="${not empty toolSessionID}">
+		var SESSION_ID = ${toolSessionID};
+	</c:if>
+	
+	function refreshToRating(questionUid) {
+		// LDEV-5052 Refresh page and scroll to the given ID on comment submit
+
+		// setting href does not navigate if url contains #, we still need a reload
+		location.hash = '#rating-table-' + questionUid;
+		location.reload();
+		return false;
+	}
+	
+	$(document).ready(function() {
+		$("time.timeago").timeago();
+	
+		//initialize bootstrap-sliders if "Enable confidence level" option is ON
+		$('.bootstrap-slider').bootstrapSlider();
+	
+		<%-- Connect to command websocket only if it is learner UI --%>
+		<c:if test="${not empty toolSessionID}">
+			// command websocket stuff for refreshing
+			// trigger is an unique ID of page and action that command websocket code in Page.tag recognises
+			commandWebsocketHookTrigger = 'assessment-results-refresh-${assessment.contentId}';
+			// if the trigger is recognised, the following action occurs
+			commandWebsocketHook = function() {
+				location.reload();
+			};
+		</c:if>
+	});
+</script>
+<script type="text/javascript" src="${lams}includes/javascript/rating.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/jquery.jRating.js"></script>
+	
 <c:forEach var="question" items="${sessionMap.pagedQuestions[pageNumber-1]}" varStatus="status">						
 							
 	<div class="panel panel-default">
-		<div class="panel-heading">
+		<div class="panel-heading">			
+			<c:if test="${param.embedded and empty toolSessionID and assessment.allowDiscloseAnswers}">
+				<div class="btn-group-xs pull-right disclose-button-group" questionUid="${question.uid}">
+					<%-- Allow disclosing correct answers only for multiple choice questions --%>
+					<c:if test="${question.type == 1}">
+						<div class="btn btn-default disclose-correct-button"
+							<c:if test="${question.correctAnswersDisclosed}">
+								disabled="disabled"><i class="fa fa-check text-success">&nbsp;</i
+							</c:if>
+							>
+							<fmt:message key="label.disclose.correct.answers"/>
+						</div>
+					</c:if>
+					<div class="btn btn-default disclose-groups-button"
+						<c:if test="${question.groupsAnswersDisclosed}">
+							disabled="disabled"><i class="fa fa-check text-success">&nbsp;</i
+						</c:if>
+						>
+						<fmt:message key="label.disclose.groups.answers"/>
+					</div>
+				</div>
+			</c:if>
+			
 			<h3 class="panel-title" style="margin-bottom: 10px;font-size: initial;">
 				<c:if test="${assessment.numbered}">
 						${status.index + sessionMap.questionNumberingOffset}.
@@ -12,7 +116,7 @@
 					${question.title}
 				</c:if>
 			</h3>
-
+			
 			<c:if test="${question.answerRequired}">
 				<span class="asterisk pull-right">
 					<i class="fa fa-xs fa-asterisk text-danger" title="<fmt:message key="label.answer.required"/>" 
@@ -77,4 +181,4 @@
 		</div>
 					
 	</div>
-</c:forEach>
+</c:forEach>
\ No newline at end of file
Index: lams_tool_assessment/web/pages/learning/results/essay.jsp
===================================================================
diff -u -r3437878235018c207f602ea0464c109dd8e077c9 -r79db1b495adba49dd54a6250c1221a326f153633
--- lams_tool_assessment/web/pages/learning/results/essay.jsp	(.../essay.jsp)	(revision 3437878235018c207f602ea0464c109dd8e077c9)
+++ lams_tool_assessment/web/pages/learning/results/essay.jsp	(.../essay.jsp)	(revision 79db1b495adba49dd54a6250c1221a326f153633)
@@ -68,7 +68,7 @@
 							</td>
 						</tr>
 					</c:if>
-					
+
 					<c:if test="${showRating}">
 						<tr>
 							<td>
Index: lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp
===================================================================
diff -u -r442b2bdacb7a49af90480f58918774b82b1868a4 -r79db1b495adba49dd54a6250c1221a326f153633
--- lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp	(.../assessment.jsp)	(revision 442b2bdacb7a49af90480f58918774b82b1868a4)
+++ lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp	(.../assessment.jsp)	(revision 79db1b495adba49dd54a6250c1221a326f153633)
@@ -28,9 +28,18 @@
 		//insert total learners number taken from the parent tblmonitor.jsp
 		$("#total-learners-number").html(TOTAL_LESSON_LEARNERS_NUMBER);
 
-		// go through each AE and set up disclose buttons there
-		$('.assessmentPane').each(function(){
-			var assessmentPane = $(this),
+		$('.results').each(function(){
+			// load results div for the first time
+			loadResultsPane($(this), false);
+		});
+		
+	});
+	
+	function loadResultsPane(resultsPane, isRefresh) {
+		// load an embedded results list
+		resultsPane.load("<c:url value='/learning/showResultsForTeacher.do'/>?embedded=true&toolContentID=" 
+					 + resultsPane.data('toolContentId'), function(){
+			var assessmentPane = resultsPane.closest('.assessmentPane'),
 				// are any correct/groups buttons clickable?
 				discloseAllCorrectEnabled = false,
 				discloseAllGroupsEnabled = false; 
@@ -53,45 +62,51 @@
 						return;
 					}
 					
-					discloseAnswers(button);
+					discloseAnswers(button, resultsPane);
 				});
 			});
 
 			// if disclose all correct/groups answers buttons are clickable, add a click handler
 			// and disable if not
 			var allCorrectButton = $('.disclose-all-correct-button', assessmentPane);
 			if (discloseAllCorrectEnabled) {
-				allCorrectButton.click(function(){
-					if (!confirm("<fmt:message key='message.disclose.all.correct.answers' />")) {
-						return;
-					}
-					$('.disclose-correct-button', assessmentPane).not('[disabled]').each(function() {
-						discloseAnswers($(this));
+				// do not add a handler twice
+				if (!isRefresh) {
+					allCorrectButton.click(function(){
+						if (!confirm("<fmt:message key='message.disclose.all.correct.answers' />")) {
+							return;
+						}
+						$('.disclose-correct-button', assessmentPane).not('[disabled]').each(function() {
+							discloseAnswers($(this), resultsPane);
+						});
+						disabledAndCheckButton(allCorrectButton);
 					});
-					disabledAndCheckButton(allCorrectButton);
-				});
+				}
 			} else {
 				disabledAndCheckButton(allCorrectButton);
 			}
 
 			var allGroupsButton = $('.disclose-all-groups-button', assessmentPane);
 			if (discloseAllGroupsEnabled) {
-				allGroupsButton.click(function(){
-					if (!confirm("<fmt:message key='message.disclose.all.groups.answers' />")) {
-						return;
-					}
-					$('.disclose-groups-button', assessmentPane).not('[disabled]').each(function() {
-						discloseAnswers($(this));
+				// do not add a handler twice
+				if (!isRefresh) {
+					allGroupsButton.click(function(){
+						if (!confirm("<fmt:message key='message.disclose.all.groups.answers' />")) {
+							return;
+						}
+						$('.disclose-groups-button', assessmentPane).not('[disabled]').each(function() {
+							discloseAnswers($(this), resultsPane);
+						});
+						disabledAndCheckButton(allGroupsButton);
 					});
-					disabledAndCheckButton(allGroupsButton);
-				});
+				}
 			} else {
 				disabledAndCheckButton(allGroupsButton);
 			}
 		});
-	});
+	}
 	
-	function discloseAnswers(button) {
+	function discloseAnswers(button, resultsPane) {
 		let isCorrectButton = button.hasClass('disclose-correct-button');
 		
 		$.ajax({
@@ -105,19 +120,14 @@
 				'<csrf:tokenname/>' : '<csrf:tokenvalue/>'
 			}
 		}).done(function(){
-			// disable the button after click
-			disabledAndCheckButton(button);
+			// reload results after disclosing answers
+			loadResultsPane(resultsPane, true);
 		});
 	}
 
 	function disabledAndCheckButton(button){
 		button.attr('disabled', true).html('<i class="fa fa-check text-success">&nbsp;</i>' + button.text());
 	}
-	
-	
-	function showResultsForTeacher(toolContentId) {
-		launchPopup("<c:url value='/learning/showResultsForTeacher.do'/>?toolContentID=" + toolContentId, 'Results');
-	}
 </script>
 
 <!-- Header -->
@@ -192,12 +202,6 @@
 				<%-- Release correct/groups answers for all questions in this assessment --%>
 				<div class="row no-gutter">
 					<div class="col-xs-12 col-md-12 col-lg-12">
-						<div class="btn btn-sm btn-default pull-right loffset10"
-							  onclick="javascript:showResultsForTeacher(${assessmentDto.assessment.contentId})">
-							<i class="fa fa-check-circle-o"></i>
-							<fmt:message key="label.monitoring.summary.results.view"/>
-						</div>
-						
 						<div class="btn-group-sm pull-right disclose-all-button-group">
 							<div class="btn btn-default disclose-all-correct-button">
 								<fmt:message key="label.disclose.all.correct.answers"/>
@@ -212,143 +216,7 @@
 				</div>
 			</c:if>
 			
-			<c:forEach var="question" items="${assessmentDto.questions}" varStatus="i">
-				<c:set var="qbQuestion" value="${question.qbQuestion}"/>
-				<div class="row no-gutter">
-				<div class="col-xs-12 col-md-12 col-lg-12">
-				<div class="panel panel-default">
-					<div class="panel-heading">
-						<div class="panel-title">
-							<c:if test="${assessmentDto.assessment.numbered}">
-								<span class="float-left space-right">Q${i.index+1})</span>
-							</c:if> 
-							
-							<c:out value="${qbQuestion.name}" escapeXml="false"/>
-							
-							<c:if test="${assessmentDto.assessment.allowDiscloseAnswers}">
-								<div class="btn-group-xs pull-right disclose-button-group" questionUid="${question.uid}">
-									<%-- Allow disclosing correct answers only for multiple choice questions --%>
-									<c:if test="${qbQuestion.type == 1}">
-										<div class="btn btn-default disclose-correct-button"
-											<c:if test="${question.correctAnswersDisclosed}">
-												disabled="disabled"><i class="fa fa-check text-success">&nbsp;</i
-											</c:if>
-											>
-											<fmt:message key="label.disclose.correct.answers"/>
-										</div>
-									</c:if>
-									<div class="btn btn-default disclose-groups-button"
-										<c:if test="${question.groupsAnswersDisclosed}">
-											disabled="disabled"><i class="fa fa-check text-success">&nbsp;</i
-										</c:if>
-										>
-										<fmt:message key="label.disclose.groups.answers"/>
-									</div>
-								</div>
-							</c:if>
-						</div>
-					</div>
-					
-					<div class="panel-body">
-						<div class="table-responsive">	
-							<c:out value="${qbQuestion.description}" escapeXml="false"/>
-							
-							<table class="table table-striped">
-								<tbody>
-									
-									<c:choose>
-										<c:when test="${qbQuestion.type == 1 || qbQuestion.type == 3}">
-											<c:forEach var="qbOption" items="${qbQuestion.qbOptions}" varStatus="j">
-												<tr>
-													<td width="5px">
-														${ALPHABET[j.index]}.
-													</td>									
-													<td>
-														<c:choose>
-															<c:when test="${qbQuestion.type == 1}">
-																<c:out value="${qbOption.name}" escapeXml="false"/>
-															</c:when>
-															<c:otherwise>
-																${fn:replace(qbOption.name, newLineChar, ', ')}
-															</c:otherwise>
-														</c:choose>
-													</td>
-												</tr>					
-											</c:forEach>						
-										</c:when>
-										
-										
-										<c:when test="${qbQuestion.type == 2}">
-											<tr style="background: none;">
-												<td style="border-top: none;">
-												</td>
-																
-												<td style="border-top: none; font-weight: bold;">
-													Possible answers
-												</td>
-											</tr>
-										
-											<c:forEach var="qbOption" items="${qbQuestion.qbOptions}" varStatus="j">
-												<tr>
-													<td>
-														<span class="pull-left">${ALPHABET[j.index]}.</span>
-																
-														<c:out value="${qbOption.matchingPair}" escapeXml="false"/>
-													</td>
-																
-													<td>
-														<c:out value="${qbOption.name}" escapeXml="false"/>
-													</td>
-												</tr>
-											</c:forEach>
-										</c:when>
-										
-										<c:when test="${(qbQuestion.type == 4) || (qbQuestion.type == 6)}">
-										</c:when>
-															
-										<c:when test="${qbQuestion.type == 5}">
-											<tr>
-												<td width="5px">
-													a.
-												</td>
-												<td>
-													<fmt:message key="label.learning.true.false.true"/>
-												</td>
-											</tr>
-											<tr>
-												<td width="5px">
-													b.
-												</td>								
-												<td>
-													<fmt:message key="label.learning.true.false.false"/>
-												</td>
-											</tr>
-										</c:when>
-															
-										<c:when test="${(qbQuestion.type == 7) || (qbQuestion.type == 8)}">
-											<c:forEach var="qbOption" items="${qbQuestion.qbOptions}" varStatus="j">
-															
-												<tr>
-													<td width="5px">
-														${ALPHABET[j.index]}.
-													</td>
-													<td>
-														<c:out value="${qbOption.name}" escapeXml="false"/>
-													</td>
-												</tr>
-												
-											</c:forEach>
-										</c:when>						
-										
-									</c:choose>
-								</tbody>
-							</table>
-						</div>
-					</div>
-				</div>  
-				</div>
-				</div>
-			</c:forEach>
+			<div class="results" data-tool-content-id="${assessmentDto.assessment.contentId}"></div>
 		</div>
 	</c:forEach>
 </div>