Index: lams_monitoring/web/tblmonitor/tblmonitor.jsp
===================================================================
diff -u -r2ce1ca7a4995e15743c5800fdd789868b0236836 -rc606e9ef96a924f5389866c6fceb1c7fee959032
--- lams_monitoring/web/tblmonitor/tblmonitor.jsp	(.../tblmonitor.jsp)	(revision 2ce1ca7a4995e15743c5800fdd789868b0236836)
+++ lams_monitoring/web/tblmonitor/tblmonitor.jsp	(.../tblmonitor.jsp)	(revision c606e9ef96a924f5389866c6fceb1c7fee959032)
@@ -119,16 +119,7 @@
 
 			$("#tblmonitor-tab-content").load(
 				url,
-				options, 
-				//callback function fired on complete
-				function() { 
-					//use jqeury toggle instead of bootstrap collapse 
-					$(".burning-question-title").on('click', function () {
-						var div =  $("#collapse-" + $(this).data("itemuid"));
-						div.toggleClass("in");
-						$(this).toggleClass("collapsed");
-					});
-				}
+				options
 			);
 		}
 
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
===================================================================
diff -u -r3eb8dcbf308a6b082c30d57f51e7000ebbe1c184 -rc606e9ef96a924f5389866c6fceb1c7fee959032
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 3eb8dcbf308a6b082c30d57f51e7000ebbe1c184)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision c606e9ef96a924f5389866c6fceb1c7fee959032)
@@ -24,6 +24,8 @@
 package org.lamsfoundation.lams.tool.scratchie.web.controller;
 
 import java.io.IOException;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
@@ -46,6 +48,7 @@
 import org.lamsfoundation.lams.qb.dto.QbStatsActivityDTO;
 import org.lamsfoundation.lams.qb.service.IQbService;
 import org.lamsfoundation.lams.tool.scratchie.ScratchieConstants;
+import org.lamsfoundation.lams.tool.scratchie.dto.BurningQuestionDTO;
 import org.lamsfoundation.lams.tool.scratchie.dto.BurningQuestionItemDTO;
 import org.lamsfoundation.lams.tool.scratchie.dto.GroupSummary;
 import org.lamsfoundation.lams.tool.scratchie.dto.LeaderResultsDTO;
@@ -58,6 +61,7 @@
 import org.lamsfoundation.lams.tool.scratchie.service.IScratchieService;
 import org.lamsfoundation.lams.tool.scratchie.util.ScratchieItemComparator;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.AlphanumComparator;
 import org.lamsfoundation.lams.util.Configuration;
 import org.lamsfoundation.lams.util.ConfigurationKeys;
 import org.lamsfoundation.lams.util.DateUtil;
@@ -137,7 +141,8 @@
 	if (scratchie.isBurningQuestionsEnabled()) {
 	    List<BurningQuestionItemDTO> burningQuestionItemDtos = scratchieService.getBurningQuestionDtos(scratchie,
 		    null, true, true);
-	    sessionMap.put(ScratchieConstants.ATTR_BURNING_QUESTION_ITEM_DTOS, burningQuestionItemDtos);
+	    MonitoringController.setUpBurningQuestions(burningQuestionItemDtos);
+	    request.setAttribute(ScratchieConstants.ATTR_BURNING_QUESTION_ITEM_DTOS, burningQuestionItemDtos);
 	}
 
 	// Create reflectList if reflection is enabled.
@@ -326,4 +331,28 @@
 	request.setAttribute(ScratchieConstants.ATTR_SESSION_MAP_ID, sessionMapID);
 	return (SessionMap<String, Object>) request.getSession().getAttribute(sessionMapID);
     }
+
+    static void setUpBurningQuestions(List<BurningQuestionItemDTO> burningQuestionItemDtos) {
+	//unescape previously escaped session names
+	for (BurningQuestionItemDTO burningQuestionItemDto : burningQuestionItemDtos) {
+	    List<BurningQuestionDTO> burningQuestionDtos = burningQuestionItemDto.getBurningQuestionDtos();
+
+	    for (BurningQuestionDTO burningQuestionDto : burningQuestionItemDto.getBurningQuestionDtos()) {
+
+		String escapedBurningQuestion = StringEscapeUtils
+			.unescapeJavaScript(burningQuestionDto.getEscapedBurningQuestion());
+		burningQuestionDto.setEscapedBurningQuestion(escapedBurningQuestion);
+
+		String sessionName = StringEscapeUtils.unescapeJavaScript(burningQuestionDto.getSessionName());
+		burningQuestionDto.setSessionName(sessionName);
+	    }
+
+	    Collections.sort(burningQuestionDtos, new Comparator<BurningQuestionDTO>() {
+		@Override
+		public int compare(BurningQuestionDTO o1, BurningQuestionDTO o2) {
+		    return new AlphanumComparator().compare(o1.getSessionName(), o2.getSessionName());
+		}
+	    });
+	}
+    }
 }
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
===================================================================
diff -u -re743566518bd5c53d6574987565cfb8581a92c66 -rc606e9ef96a924f5389866c6fceb1c7fee959032
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java	(.../TblMonitorController.java)	(revision e743566518bd5c53d6574987565cfb8581a92c66)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java	(.../TblMonitorController.java)	(revision c606e9ef96a924f5389866c6fceb1c7fee959032)
@@ -25,8 +25,6 @@
 
 import java.io.IOException;
 import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -38,10 +36,8 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.tool.scratchie.ScratchieConstants;
-import org.lamsfoundation.lams.tool.scratchie.dto.BurningQuestionDTO;
 import org.lamsfoundation.lams.tool.scratchie.dto.BurningQuestionItemDTO;
 import org.lamsfoundation.lams.tool.scratchie.dto.GroupSummary;
 import org.lamsfoundation.lams.tool.scratchie.dto.ScratchieItemDTO;
@@ -51,7 +47,6 @@
 import org.lamsfoundation.lams.tool.scratchie.model.ScratchieUser;
 import org.lamsfoundation.lams.tool.scratchie.service.IScratchieService;
 import org.lamsfoundation.lams.tool.scratchie.util.ScratchieItemComparator;
-import org.lamsfoundation.lams.util.AlphanumComparator;
 import org.lamsfoundation.lams.util.FileUtil;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.util.excel.ExcelSheet;
@@ -185,36 +180,18 @@
 	    List<BurningQuestionItemDTO> burningQuestionItemDtos = scratchieService.getBurningQuestionDtos(scratchie,
 		    null, true, true);
 
-	    //unescape previously escaped session names
-	    for (BurningQuestionItemDTO burningQuestionItemDto : burningQuestionItemDtos) {
-		List<BurningQuestionDTO> burningQuestionDtos = burningQuestionItemDto.getBurningQuestionDtos();
+	    MonitoringController.setUpBurningQuestions(burningQuestionItemDtos);
 
-		for (BurningQuestionDTO burningQuestionDto : burningQuestionItemDto.getBurningQuestionDtos()) {
-
-		    String escapedBurningQuestion = StringEscapeUtils
-			    .unescapeJavaScript(burningQuestionDto.getEscapedBurningQuestion());
-		    burningQuestionDto.setEscapedBurningQuestion(escapedBurningQuestion);
-
-		    String sessionName = StringEscapeUtils.unescapeJavaScript(burningQuestionDto.getSessionName());
-		    burningQuestionDto.setSessionName(sessionName);
-		}
-
-		Collections.sort(burningQuestionDtos, new Comparator<BurningQuestionDTO>() {
-		    @Override
-		    public int compare(BurningQuestionDTO o1, BurningQuestionDTO o2) {
-			return new AlphanumComparator().compare(o1.getSessionName(), o2.getSessionName());
-		    }
-		});
-	    }
-
 	    request.setAttribute(ScratchieConstants.ATTR_BURNING_QUESTION_ITEM_DTOS, burningQuestionItemDtos);
 
 	    ScratchieConfigItem hideTitles = scratchieService.getConfigItem(ScratchieConfigItem.KEY_HIDE_TITLES);
 	    request.setAttribute(ScratchieConfigItem.KEY_HIDE_TITLES, Boolean.valueOf(hideTitles.getConfigValue()));
 
 	}
 
-	return "pages/tblmonitoring/burningQuestions";
+	request.setAttribute("isTbl", true);
+
+	return "pages/monitoring/parts/burningQuestions";
     }
 
     /**
Index: lams_tool_scratchie/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r094d165248768ab19f66d75424a6a13ec968b829 -rc606e9ef96a924f5389866c6fceb1c7fee959032
--- lams_tool_scratchie/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 094d165248768ab19f66d75424a6a13ec968b829)
+++ lams_tool_scratchie/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision c606e9ef96a924f5389866c6fceb1c7fee959032)
@@ -10,6 +10,8 @@
 	<lams:head>
 	
 	<lams:css/>
+	<lams:css webapp="monitoring" suffix="tblmonitor"/>
+	
 	<link type="text/css" href="${lams}css/jquery-ui-bootstrap-theme.css" rel="stylesheet">
 	<link type="text/css" href="${lams}css/thickbox.css" rel="stylesheet"  media="screen">
 	<link href="${lams}css/jquery-ui.timepicker.css" rel="stylesheet" type="text/css" >
Index: lams_tool_scratchie/web/pages/monitoring/parts/burningQuestions.jsp
===================================================================
diff -u
--- lams_tool_scratchie/web/pages/monitoring/parts/burningQuestions.jsp	(revision 0)
+++ lams_tool_scratchie/web/pages/monitoring/parts/burningQuestions.jsp	(revision c606e9ef96a924f5389866c6fceb1c7fee959032)
@@ -0,0 +1,172 @@
+<%@ include file="/common/taglibs.jsp"%>
+<script>
+	$(document).ready(function(){
+		//handler for expand/collapse all button
+		$("#toggle-burning-questions-button").click(function() {
+			var isExpanded = eval($(this).data("expanded"));
+				
+			//fire the actual buttons so burning questions can be closed/expanded
+			if (isExpanded) {
+				$(".burning-question-title:not('.collapsed')").each(function() {
+					this.click();
+				});
+								
+			} else {
+				$(".burning-question-title.collapsed").each(function() {
+					this.click();
+				});					
+			}
+
+			//change button label
+			var newButtonLabel = isExpanded ? "<fmt:message key='label.expand.all' />" : "<fmt:message key='label.collapse.all' />";
+			$(".hidden-xs", $(this)).text(newButtonLabel);
+
+			//change button icon
+			if (isExpanded) {
+				$(".fa", $(this)).removeClass("fa-minus-circle").addClass("fa-plus-circle");
+			} else {
+				$(".fa", $(this)).removeClass("fa-plus-circle").addClass("fa-minus-circle");
+			}
+
+			//change button's data-expanded attribute
+			$(this).data("expanded", !isExpanded);
+		});
+		
+		$('.options-show-link').click(function(e){
+			// so browser does not go to the top of page
+			e.preventDefault();
+			
+			// hide link, show answers
+			let link = $(this),
+				itemUid = link.data('itemUid');
+			link.remove();
+			$('#options-' + itemUid).show();
+		});
+
+		//use jqeury toggle instead of bootstrap collapse 
+		$(".burning-question-title").on('click', function () {
+			var div =  $("#collapse-" + $(this).data("itemuid"));
+			div.toggleClass("in");
+			$(this).toggleClass("collapsed");
+		});
+	});
+</script>
+
+<!-- Header -->
+<div class="row no-gutter">
+	<div class="col-xs-12">
+        <button type="button" id="toggle-burning-questions-button" class="btn btn-sm btn-default pull-right ${isTbl ? 'voffset20' : ''}" data-expanded="false">
+           	<i class="fa fa-plus-circle"></i> 
+           	<span class="hidden-xs">
+           		<fmt:message key='label.expand.all' />
+           	</span>
+        </button>
+        <c:if test="${isTbl}">
+			<h3>
+				<fmt:message key="label.burning.questions"/>
+			</h3>
+		</c:if>
+	</div>
+</div>
+<!-- End header -->              
+
+<!-- Tables -->
+<div class="row no-gutter voffset10">
+<div class="col-xs-12 col-md-12 col-lg-12">
+
+	<c:forEach var="burningQuestionItemDto" items="${burningQuestionItemDtos}" varStatus="i">
+		<c:set var="burningQsCount" value="${fn:length(burningQuestionItemDto.burningQuestionDtos)}"/>
+		<c:set var="item" value="${burningQuestionItemDto.scratchieItem}"/>
+		
+		<div class="panel panel-default">
+			<div class="panel-heading">
+				<h4 class="panel-title panel-collapse">
+					
+					<!-- Don't display number prior to general burning question -->
+					<c:set var="itemTitle">
+						<c:choose>
+							<c:when test="${empty burningQuestionItemDto.scratchieItem.uid}">
+								<c:out value="${item.qbQuestion.name}" escapeXml="false"/>
+							</c:when>
+							<c:otherwise>
+								Q${i.index+1}) 
+								<c:if test="${not hideTitles}">
+									<c:out value="${item.qbQuestion.name}" escapeXml="false"/>
+								</c:if> 
+							</c:otherwise>
+						</c:choose>
+					</c:set>
+				
+					<c:choose>
+						<c:when test="${empty burningQuestionItemDto.scratchieItem.uid and burningQsCount == 0}">
+							${itemTitle} 
+						</c:when>
+						<c:otherwise>
+							<a data-toggle="collapse" data-itemuid="${item.uid}" class="collapsed burning-question-title">
+								${itemTitle}
+							</a>
+							
+							<span class="badge pull-right" style="margin-right: 4px">${burningQsCount}</span>
+						</c:otherwise>
+					</c:choose> 
+				</h4>
+			</div>
+		
+			<c:if test="${not empty burningQuestionItemDto.scratchieItem.uid or burningQsCount > 0}">
+				<div id="collapse-${item.uid}" class="panel-collapse collapse">
+				<div class="panel-body">
+				
+					<span class="burning-question-description">
+						<c:out value="${item.qbQuestion.description}" escapeXml="false"/><br /> 
+					</span>
+					
+					<c:if test="${not empty burningQuestionItemDto.scratchieItem.uid}">
+						<a id="options-show-${item.uid}" href="#" class="options-show-link" 
+						   data-item-uid="${item.uid}">
+							<fmt:message key='label.options.show' />
+						</a>
+						<div  id="options-${item.uid}" class="voffset10 table-responsive" style="display: none">
+							<table class="table table-striped table-hover">
+								<c:forEach var="answer" items="${item.qbQuestion.qbOptions}" varStatus="j">
+									<c:set var="cssClass"><c:if test='${answer.correct}'>bg-success</c:if></c:set>
+									<tr>
+										<td width="5px" class="${cssClass}">
+											${ALPHABET[j.index]}.
+										</td>
+										<td class="${cssClass}">
+											<c:out value="${answer.name}" escapeXml="false"/> 
+										</td>
+									</tr>
+								</c:forEach>
+							</table>
+						</div>
+					</c:if>
+					
+					<div class="table-responsive voffset10">
+						<table class="table table-striped table-bordered table-hover">
+							<tbody>
+								<c:forEach var="burningQuestionDto" items="${burningQuestionItemDto.burningQuestionDtos}">
+									<tr>
+										<td class="text-nowrap">
+											<c:out value="${burningQuestionDto.sessionName}" escapeXml="false"/>
+										</td>
+										<td>
+											${burningQuestionDto.escapedBurningQuestion}
+										</td>
+										<td class="text-nowrap">
+											<span class="badge">${burningQuestionDto.likeCount}</span> &nbsp; <i class="fa fa-thumbs-o-up" style="color:darkblue"></i>
+										</td>
+									</tr>
+								</c:forEach>
+							</tbody>
+						</table>
+					</div>
+				</div>
+				</div>
+			</c:if>
+			
+		</div>
+	</c:forEach>    
+  
+</div>
+</div>
Index: lams_tool_scratchie/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r3b0f9138b73adccc73267089b5430769ffbf490a -rc606e9ef96a924f5389866c6fceb1c7fee959032
--- lams_tool_scratchie/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 3b0f9138b73adccc73267089b5430769ffbf490a)
+++ lams_tool_scratchie/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision c606e9ef96a924f5389866c6fceb1c7fee959032)
@@ -32,6 +32,10 @@
 	    -webkit-border-radius:0;
 	    -khtml-border-radius:0;
 	}
+	
+	#collapseBurning .panel {
+		margin-bottom: 20px;
+	}
 </style>
 
 <script type="text/javascript">
@@ -422,18 +426,7 @@
 		        </div>
 		
 		        <div id="collapseBurning" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingBurning" style="padding: 10px;">
-					<c:forEach var="burningQuestionItemDto" items="${sessionMap.burningQuestionItemDtos}" varStatus="i">
-						<div class="voffset10"><strong>
-							<c:if test="${not i.last}">
-								${i.count})&nbsp;
-								
-							</c:if>
-							<c:if test="${not sessionMap.hideTitles}">
-								<c:out value="${burningQuestionItemDto.scratchieItem.qbQuestion.name}" />
-							</c:if>
-						</strong></div>
-						<table id="burningQuestions${burningQuestionItemDto.scratchieItem.uid}" class="scroll" cellpadding="0" cellspacing="0"></table>
-					</c:forEach>
+					<%@ include file="parts/burningQuestions.jsp"%>
 				</div>
 			</div>
 		</div>
Fisheye: Tag c606e9ef96a924f5389866c6fceb1c7fee959032 refers to a dead (removed) revision in file `lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?