Index: lams_admin/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc -r47af8921ff7d63addfeff2b9624c23fa0602bf63
--- lams_admin/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
+++ lams_admin/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 47af8921ff7d63addfeff2b9624c23fa0602bf63)
@@ -15,6 +15,7 @@
 <%@ attribute name="showChat" required="false" rtexprvalue="true" %>
 <%@ attribute name="height" required="false" rtexprvalue="true" %>
 <%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+<%@ attribute name="showOnDemand" required="false" rtexprvalue="true" %>
 
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
@@ -33,11 +34,15 @@
 <%-- THIS TAG REQUIRES JQUERY --%>
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
 <script type="text/javascript">
-	$(document).ready(function(){
+	var etherpadInitMethods = typeof etherpadInitMethods == 'undefined' ? {} : etherpadInitMethods;
+	etherpadInitMethods['${groupId}'] = function intialiseEtherpad() {
+		var showOnDemand = '${showOnDemand}' == 'true';
 		// If there are mutliple Etherpads on a single page, there is a race condition while setting session ID cookie.
 		// One of pads usually responds with "access denied". It is better to wait 1.5 seconds and initialise the next pad.
-		var delayBeforeInitialise = typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
-		lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		var delayBeforeInitialise = showOnDemand || typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
+		if (!showOnDemand) {
+			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		}
 		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
@@ -66,7 +71,6 @@
 				},
 				dataType : 'text',
 				success: function(padId, status, xhr) {
-					lamsEtherpadTagInitialising = false;
 					if ( status == "error" ) {
 						console.log( xhr.status + " " + xhr.statusText );
 					} else {
@@ -82,13 +86,20 @@
 								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
 								,'userName':'<c:out value="${fullName}" />'
 							</c:if>
-						});
+						}).addClass('initialised');
 					}
 				}
 			});
 			// wait for other pad on the page to initialise
 		}, delayBeforeInitialise);
-	});
+	}
+	
+	if ('${showOnDemand}' != 'true') {
+		$(document).ready(function(){
+			etherpadInitMethods['${groupId}']();
+		});
+	}
+
 </script>
 
 <div class="etherpad-container" id='etherpad-container-${groupId}'></div>
Index: lams_central/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc -r47af8921ff7d63addfeff2b9624c23fa0602bf63
--- lams_central/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
+++ lams_central/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 47af8921ff7d63addfeff2b9624c23fa0602bf63)
@@ -15,6 +15,7 @@
 <%@ attribute name="showChat" required="false" rtexprvalue="true" %>
 <%@ attribute name="height" required="false" rtexprvalue="true" %>
 <%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+<%@ attribute name="showOnDemand" required="false" rtexprvalue="true" %>
 
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
@@ -33,11 +34,15 @@
 <%-- THIS TAG REQUIRES JQUERY --%>
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
 <script type="text/javascript">
-	$(document).ready(function(){
+	var etherpadInitMethods = typeof etherpadInitMethods == 'undefined' ? {} : etherpadInitMethods;
+	etherpadInitMethods['${groupId}'] = function intialiseEtherpad() {
+		var showOnDemand = '${showOnDemand}' == 'true';
 		// If there are mutliple Etherpads on a single page, there is a race condition while setting session ID cookie.
 		// One of pads usually responds with "access denied". It is better to wait 1.5 seconds and initialise the next pad.
-		var delayBeforeInitialise = typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
-		lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		var delayBeforeInitialise = showOnDemand || typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
+		if (!showOnDemand) {
+			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		}
 		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
@@ -66,7 +71,6 @@
 				},
 				dataType : 'text',
 				success: function(padId, status, xhr) {
-					lamsEtherpadTagInitialising = false;
 					if ( status == "error" ) {
 						console.log( xhr.status + " " + xhr.statusText );
 					} else {
@@ -82,13 +86,20 @@
 								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
 								,'userName':'<c:out value="${fullName}" />'
 							</c:if>
-						});
+						}).addClass('initialised');
 					}
 				}
 			});
 			// wait for other pad on the page to initialise
 		}, delayBeforeInitialise);
-	});
+	}
+	
+	if ('${showOnDemand}' != 'true') {
+		$(document).ready(function(){
+			etherpadInitMethods['${groupId}']();
+		});
+	}
+
 </script>
 
 <div class="etherpad-container" id='etherpad-container-${groupId}'></div>
Index: lams_gradebook/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc -r47af8921ff7d63addfeff2b9624c23fa0602bf63
--- lams_gradebook/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
+++ lams_gradebook/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 47af8921ff7d63addfeff2b9624c23fa0602bf63)
@@ -15,6 +15,7 @@
 <%@ attribute name="showChat" required="false" rtexprvalue="true" %>
 <%@ attribute name="height" required="false" rtexprvalue="true" %>
 <%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+<%@ attribute name="showOnDemand" required="false" rtexprvalue="true" %>
 
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
@@ -33,11 +34,15 @@
 <%-- THIS TAG REQUIRES JQUERY --%>
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
 <script type="text/javascript">
-	$(document).ready(function(){
+	var etherpadInitMethods = typeof etherpadInitMethods == 'undefined' ? {} : etherpadInitMethods;
+	etherpadInitMethods['${groupId}'] = function intialiseEtherpad() {
+		var showOnDemand = '${showOnDemand}' == 'true';
 		// If there are mutliple Etherpads on a single page, there is a race condition while setting session ID cookie.
 		// One of pads usually responds with "access denied". It is better to wait 1.5 seconds and initialise the next pad.
-		var delayBeforeInitialise = typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
-		lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		var delayBeforeInitialise = showOnDemand || typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
+		if (!showOnDemand) {
+			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		}
 		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
@@ -66,7 +71,6 @@
 				},
 				dataType : 'text',
 				success: function(padId, status, xhr) {
-					lamsEtherpadTagInitialising = false;
 					if ( status == "error" ) {
 						console.log( xhr.status + " " + xhr.statusText );
 					} else {
@@ -82,13 +86,20 @@
 								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
 								,'userName':'<c:out value="${fullName}" />'
 							</c:if>
-						});
+						}).addClass('initialised');
 					}
 				}
 			});
 			// wait for other pad on the page to initialise
 		}, delayBeforeInitialise);
-	});
+	}
+	
+	if ('${showOnDemand}' != 'true') {
+		$(document).ready(function(){
+			etherpadInitMethods['${groupId}']();
+		});
+	}
+
 </script>
 
 <div class="etherpad-container" id='etherpad-container-${groupId}'></div>
Index: lams_learning/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc -r47af8921ff7d63addfeff2b9624c23fa0602bf63
--- lams_learning/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
+++ lams_learning/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 47af8921ff7d63addfeff2b9624c23fa0602bf63)
@@ -15,6 +15,7 @@
 <%@ attribute name="showChat" required="false" rtexprvalue="true" %>
 <%@ attribute name="height" required="false" rtexprvalue="true" %>
 <%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+<%@ attribute name="showOnDemand" required="false" rtexprvalue="true" %>
 
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
@@ -33,11 +34,15 @@
 <%-- THIS TAG REQUIRES JQUERY --%>
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
 <script type="text/javascript">
-	$(document).ready(function(){
+	var etherpadInitMethods = typeof etherpadInitMethods == 'undefined' ? {} : etherpadInitMethods;
+	etherpadInitMethods['${groupId}'] = function intialiseEtherpad() {
+		var showOnDemand = '${showOnDemand}' == 'true';
 		// If there are mutliple Etherpads on a single page, there is a race condition while setting session ID cookie.
 		// One of pads usually responds with "access denied". It is better to wait 1.5 seconds and initialise the next pad.
-		var delayBeforeInitialise = typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
-		lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		var delayBeforeInitialise = showOnDemand || typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
+		if (!showOnDemand) {
+			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		}
 		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
@@ -66,7 +71,6 @@
 				},
 				dataType : 'text',
 				success: function(padId, status, xhr) {
-					lamsEtherpadTagInitialising = false;
 					if ( status == "error" ) {
 						console.log( xhr.status + " " + xhr.statusText );
 					} else {
@@ -82,13 +86,20 @@
 								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
 								,'userName':'<c:out value="${fullName}" />'
 							</c:if>
-						});
+						}).addClass('initialised');
 					}
 				}
 			});
 			// wait for other pad on the page to initialise
 		}, delayBeforeInitialise);
-	});
+	}
+	
+	if ('${showOnDemand}' != 'true') {
+		$(document).ready(function(){
+			etherpadInitMethods['${groupId}']();
+		});
+	}
+
 </script>
 
 <div class="etherpad-container" id='etherpad-container-${groupId}'></div>
Index: lams_monitoring/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc -r47af8921ff7d63addfeff2b9624c23fa0602bf63
--- lams_monitoring/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
+++ lams_monitoring/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 47af8921ff7d63addfeff2b9624c23fa0602bf63)
@@ -15,6 +15,7 @@
 <%@ attribute name="showChat" required="false" rtexprvalue="true" %>
 <%@ attribute name="height" required="false" rtexprvalue="true" %>
 <%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+<%@ attribute name="showOnDemand" required="false" rtexprvalue="true" %>
 
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
@@ -33,11 +34,15 @@
 <%-- THIS TAG REQUIRES JQUERY --%>
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
 <script type="text/javascript">
-	$(document).ready(function(){
+	var etherpadInitMethods = typeof etherpadInitMethods == 'undefined' ? {} : etherpadInitMethods;
+	etherpadInitMethods['${groupId}'] = function intialiseEtherpad() {
+		var showOnDemand = '${showOnDemand}' == 'true';
 		// If there are mutliple Etherpads on a single page, there is a race condition while setting session ID cookie.
 		// One of pads usually responds with "access denied". It is better to wait 1.5 seconds and initialise the next pad.
-		var delayBeforeInitialise = typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
-		lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		var delayBeforeInitialise = showOnDemand || typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
+		if (!showOnDemand) {
+			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		}
 		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
@@ -66,7 +71,6 @@
 				},
 				dataType : 'text',
 				success: function(padId, status, xhr) {
-					lamsEtherpadTagInitialising = false;
 					if ( status == "error" ) {
 						console.log( xhr.status + " " + xhr.statusText );
 					} else {
@@ -82,13 +86,20 @@
 								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
 								,'userName':'<c:out value="${fullName}" />'
 							</c:if>
-						});
+						}).addClass('initialised');
 					}
 				}
 			});
 			// wait for other pad on the page to initialise
 		}, delayBeforeInitialise);
-	});
+	}
+	
+	if ('${showOnDemand}' != 'true') {
+		$(document).ready(function(){
+			etherpadInitMethods['${groupId}']();
+		});
+	}
+
 </script>
 
 <div class="etherpad-container" id='etherpad-container-${groupId}'></div>
Index: lams_tool_assessment/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc -r47af8921ff7d63addfeff2b9624c23fa0602bf63
--- lams_tool_assessment/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
+++ lams_tool_assessment/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 47af8921ff7d63addfeff2b9624c23fa0602bf63)
@@ -15,6 +15,7 @@
 <%@ attribute name="showChat" required="false" rtexprvalue="true" %>
 <%@ attribute name="height" required="false" rtexprvalue="true" %>
 <%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+<%@ attribute name="showOnDemand" required="false" rtexprvalue="true" %>
 
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
@@ -33,11 +34,15 @@
 <%-- THIS TAG REQUIRES JQUERY --%>
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
 <script type="text/javascript">
-	$(document).ready(function(){
+	var etherpadInitMethods = typeof etherpadInitMethods == 'undefined' ? {} : etherpadInitMethods;
+	etherpadInitMethods['${groupId}'] = function intialiseEtherpad() {
+		var showOnDemand = '${showOnDemand}' == 'true';
 		// If there are mutliple Etherpads on a single page, there is a race condition while setting session ID cookie.
 		// One of pads usually responds with "access denied". It is better to wait 1.5 seconds and initialise the next pad.
-		var delayBeforeInitialise = typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
-		lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		var delayBeforeInitialise = showOnDemand || typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
+		if (!showOnDemand) {
+			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		}
 		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
@@ -66,7 +71,6 @@
 				},
 				dataType : 'text',
 				success: function(padId, status, xhr) {
-					lamsEtherpadTagInitialising = false;
 					if ( status == "error" ) {
 						console.log( xhr.status + " " + xhr.statusText );
 					} else {
@@ -82,13 +86,20 @@
 								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
 								,'userName':'<c:out value="${fullName}" />'
 							</c:if>
-						});
+						}).addClass('initialised');
 					}
 				}
 			});
 			// wait for other pad on the page to initialise
 		}, delayBeforeInitialise);
-	});
+	}
+	
+	if ('${showOnDemand}' != 'true') {
+		$(document).ready(function(){
+			etherpadInitMethods['${groupId}']();
+		});
+	}
+
 </script>
 
 <div class="etherpad-container" id='etherpad-container-${groupId}'></div>
Index: lams_tool_assessment/web/pages/learning/learning.jsp
===================================================================
diff -u -r5b3de375324cb89215865883a2658932ff2bd846 -r47af8921ff7d63addfeff2b9624c23fa0602bf63
--- lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 5b3de375324cb89215865883a2658932ff2bd846)
+++ lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 47af8921ff7d63addfeff2b9624c23fa0602bf63)
@@ -115,6 +115,16 @@
 					'minLength' : 3
 				});
 			});
+			
+			// show etherpads only on Discussion expand
+			$('.question-etherpad-collapse').on('show.bs.collapse', function(){
+				var etherpad = $('.etherpad-container', this);
+				if (!etherpad.hasClass('initialised')) {
+					var id = etherpad.attr('id'),
+						groupId = id.substring('etherpad-container-'.length);
+					etherpadInitMethods[groupId]();
+				}
+			});
 		});
 		
 		function countHedgeQuestionSelectTotal(questionIndex) {
Index: lams_tool_assessment/web/pages/learning/parts/allquestions.jsp
===================================================================
diff -u -r5a62cc80251df3c79ed6fd4ffd5cb5c8c67333fb -r47af8921ff7d63addfeff2b9624c23fa0602bf63
--- lams_tool_assessment/web/pages/learning/parts/allquestions.jsp	(.../allquestions.jsp)	(revision 5a62cc80251df3c79ed6fd4ffd5cb5c8c67333fb)
+++ lams_tool_assessment/web/pages/learning/parts/allquestions.jsp	(.../allquestions.jsp)	(revision 47af8921ff7d63addfeff2b9624c23fa0602bf63)
@@ -120,10 +120,10 @@
 					<fmt:message key="label.etherpad.discussion" />
 				</a>
 				
-				<div id="question-etherpad-${question.uid}" class="collapse">
+				<div id="question-etherpad-${question.uid}" class="question-etherpad-collapse collapse">
 					<div class="panel panel-default question-etherpad">
 						<lams:Etherpad groupId="etherpad-assessment-${toolSessionID}-question-${question.uid}" 
-						   showControls="${mode eq 'teacher'}" showChat="false" heightAutoGrow="true"
+						   showControls="${mode eq 'teacher'}" showChat="false" heightAutoGrow="true" showOnDemand="true"
 						>${questionEtherpadContent}</lams:Etherpad>
 					</div>
 				</div>
Index: lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp
===================================================================
diff -u -r176148cb89d309b36c840ababb3ccdf182897ada -r47af8921ff7d63addfeff2b9624c23fa0602bf63
--- lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp	(.../usersummary.jsp)	(revision 176148cb89d309b36c840ababb3ccdf182897ada)
+++ lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp	(.../usersummary.jsp)	(revision 47af8921ff7d63addfeff2b9624c23fa0602bf63)
@@ -140,6 +140,16 @@
 	  		        }
 	  			});
 	  			setTimeout(function(){ window.dispatchEvent(new Event('resize')); }, 300);
+	  			
+				// show etherpads only on Discussion expand
+				$('.question-etherpad-collapse').on('show.bs.collapse', function(){
+					var etherpad = $('.etherpad-container', this);
+					if (!etherpad.hasClass('initialised')) {
+						var id = etherpad.attr('id'),
+							groupId = id.substring('etherpad-container-'.length);
+						etherpadInitMethods[groupId]();
+					}
+				});
 	  		});  	    	
 
     		function refreshSummaryPage()  { 
@@ -245,10 +255,10 @@
 							<fmt:message key="label.etherpad.discussion" />
 						</a>
 						
-						<div id="question-etherpad-${userSummaryItem.questionDto.uid}" class="collapse">
+						<div id="question-etherpad-${userSummaryItem.questionDto.uid}" class="question-etherpad-collapse collapse">
 							<div class="panel panel-default question-etherpad">
 								<lams:Etherpad groupId="etherpad-assessment-${toolSessionID}-question-${userSummaryItem.questionDto.uid}" 
-								   showControls="true" showChat="false" heightAutoGrow="true" />
+								   showControls="true" showChat="false" heightAutoGrow="true" showOnDemand="true" />
 							</div>
 						</div>
 					</div>
Index: lams_tool_chat/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc -r47af8921ff7d63addfeff2b9624c23fa0602bf63
--- lams_tool_chat/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
+++ lams_tool_chat/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 47af8921ff7d63addfeff2b9624c23fa0602bf63)
@@ -15,6 +15,7 @@
 <%@ attribute name="showChat" required="false" rtexprvalue="true" %>
 <%@ attribute name="height" required="false" rtexprvalue="true" %>
 <%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+<%@ attribute name="showOnDemand" required="false" rtexprvalue="true" %>
 
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
@@ -33,11 +34,15 @@
 <%-- THIS TAG REQUIRES JQUERY --%>
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
 <script type="text/javascript">
-	$(document).ready(function(){
+	var etherpadInitMethods = typeof etherpadInitMethods == 'undefined' ? {} : etherpadInitMethods;
+	etherpadInitMethods['${groupId}'] = function intialiseEtherpad() {
+		var showOnDemand = '${showOnDemand}' == 'true';
 		// If there are mutliple Etherpads on a single page, there is a race condition while setting session ID cookie.
 		// One of pads usually responds with "access denied". It is better to wait 1.5 seconds and initialise the next pad.
-		var delayBeforeInitialise = typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
-		lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		var delayBeforeInitialise = showOnDemand || typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
+		if (!showOnDemand) {
+			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		}
 		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
@@ -66,7 +71,6 @@
 				},
 				dataType : 'text',
 				success: function(padId, status, xhr) {
-					lamsEtherpadTagInitialising = false;
 					if ( status == "error" ) {
 						console.log( xhr.status + " " + xhr.statusText );
 					} else {
@@ -82,13 +86,20 @@
 								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
 								,'userName':'<c:out value="${fullName}" />'
 							</c:if>
-						});
+						}).addClass('initialised');
 					}
 				}
 			});
 			// wait for other pad on the page to initialise
 		}, delayBeforeInitialise);
-	});
+	}
+	
+	if ('${showOnDemand}' != 'true') {
+		$(document).ready(function(){
+			etherpadInitMethods['${groupId}']();
+		});
+	}
+
 </script>
 
 <div class="etherpad-container" id='etherpad-container-${groupId}'></div>
Index: lams_tool_daco/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc -r47af8921ff7d63addfeff2b9624c23fa0602bf63
--- lams_tool_daco/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
+++ lams_tool_daco/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 47af8921ff7d63addfeff2b9624c23fa0602bf63)
@@ -15,6 +15,7 @@
 <%@ attribute name="showChat" required="false" rtexprvalue="true" %>
 <%@ attribute name="height" required="false" rtexprvalue="true" %>
 <%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+<%@ attribute name="showOnDemand" required="false" rtexprvalue="true" %>
 
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
@@ -33,11 +34,15 @@
 <%-- THIS TAG REQUIRES JQUERY --%>
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
 <script type="text/javascript">
-	$(document).ready(function(){
+	var etherpadInitMethods = typeof etherpadInitMethods == 'undefined' ? {} : etherpadInitMethods;
+	etherpadInitMethods['${groupId}'] = function intialiseEtherpad() {
+		var showOnDemand = '${showOnDemand}' == 'true';
 		// If there are mutliple Etherpads on a single page, there is a race condition while setting session ID cookie.
 		// One of pads usually responds with "access denied". It is better to wait 1.5 seconds and initialise the next pad.
-		var delayBeforeInitialise = typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
-		lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		var delayBeforeInitialise = showOnDemand || typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
+		if (!showOnDemand) {
+			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		}
 		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
@@ -66,7 +71,6 @@
 				},
 				dataType : 'text',
 				success: function(padId, status, xhr) {
-					lamsEtherpadTagInitialising = false;
 					if ( status == "error" ) {
 						console.log( xhr.status + " " + xhr.statusText );
 					} else {
@@ -82,13 +86,20 @@
 								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
 								,'userName':'<c:out value="${fullName}" />'
 							</c:if>
-						});
+						}).addClass('initialised');
 					}
 				}
 			});
 			// wait for other pad on the page to initialise
 		}, delayBeforeInitialise);
-	});
+	}
+	
+	if ('${showOnDemand}' != 'true') {
+		$(document).ready(function(){
+			etherpadInitMethods['${groupId}']();
+		});
+	}
+
 </script>
 
 <div class="etherpad-container" id='etherpad-container-${groupId}'></div>
Index: lams_tool_doku/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc -r47af8921ff7d63addfeff2b9624c23fa0602bf63
--- lams_tool_doku/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
+++ lams_tool_doku/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 47af8921ff7d63addfeff2b9624c23fa0602bf63)
@@ -15,6 +15,7 @@
 <%@ attribute name="showChat" required="false" rtexprvalue="true" %>
 <%@ attribute name="height" required="false" rtexprvalue="true" %>
 <%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+<%@ attribute name="showOnDemand" required="false" rtexprvalue="true" %>
 
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
@@ -33,11 +34,15 @@
 <%-- THIS TAG REQUIRES JQUERY --%>
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
 <script type="text/javascript">
-	$(document).ready(function(){
+	var etherpadInitMethods = typeof etherpadInitMethods == 'undefined' ? {} : etherpadInitMethods;
+	etherpadInitMethods['${groupId}'] = function intialiseEtherpad() {
+		var showOnDemand = '${showOnDemand}' == 'true';
 		// If there are mutliple Etherpads on a single page, there is a race condition while setting session ID cookie.
 		// One of pads usually responds with "access denied". It is better to wait 1.5 seconds and initialise the next pad.
-		var delayBeforeInitialise = typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
-		lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		var delayBeforeInitialise = showOnDemand || typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
+		if (!showOnDemand) {
+			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		}
 		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
@@ -66,7 +71,6 @@
 				},
 				dataType : 'text',
 				success: function(padId, status, xhr) {
-					lamsEtherpadTagInitialising = false;
 					if ( status == "error" ) {
 						console.log( xhr.status + " " + xhr.statusText );
 					} else {
@@ -82,13 +86,20 @@
 								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
 								,'userName':'<c:out value="${fullName}" />'
 							</c:if>
-						});
+						}).addClass('initialised');
 					}
 				}
 			});
 			// wait for other pad on the page to initialise
 		}, delayBeforeInitialise);
-	});
+	}
+	
+	if ('${showOnDemand}' != 'true') {
+		$(document).ready(function(){
+			etherpadInitMethods['${groupId}']();
+		});
+	}
+
 </script>
 
 <div class="etherpad-container" id='etherpad-container-${groupId}'></div>
Index: lams_tool_forum/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc -r47af8921ff7d63addfeff2b9624c23fa0602bf63
--- lams_tool_forum/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
+++ lams_tool_forum/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 47af8921ff7d63addfeff2b9624c23fa0602bf63)
@@ -15,6 +15,7 @@
 <%@ attribute name="showChat" required="false" rtexprvalue="true" %>
 <%@ attribute name="height" required="false" rtexprvalue="true" %>
 <%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+<%@ attribute name="showOnDemand" required="false" rtexprvalue="true" %>
 
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
@@ -33,11 +34,15 @@
 <%-- THIS TAG REQUIRES JQUERY --%>
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
 <script type="text/javascript">
-	$(document).ready(function(){
+	var etherpadInitMethods = typeof etherpadInitMethods == 'undefined' ? {} : etherpadInitMethods;
+	etherpadInitMethods['${groupId}'] = function intialiseEtherpad() {
+		var showOnDemand = '${showOnDemand}' == 'true';
 		// If there are mutliple Etherpads on a single page, there is a race condition while setting session ID cookie.
 		// One of pads usually responds with "access denied". It is better to wait 1.5 seconds and initialise the next pad.
-		var delayBeforeInitialise = typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
-		lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		var delayBeforeInitialise = showOnDemand || typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
+		if (!showOnDemand) {
+			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		}
 		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
@@ -66,7 +71,6 @@
 				},
 				dataType : 'text',
 				success: function(padId, status, xhr) {
-					lamsEtherpadTagInitialising = false;
 					if ( status == "error" ) {
 						console.log( xhr.status + " " + xhr.statusText );
 					} else {
@@ -82,13 +86,20 @@
 								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
 								,'userName':'<c:out value="${fullName}" />'
 							</c:if>
-						});
+						}).addClass('initialised');
 					}
 				}
 			});
 			// wait for other pad on the page to initialise
 		}, delayBeforeInitialise);
-	});
+	}
+	
+	if ('${showOnDemand}' != 'true') {
+		$(document).ready(function(){
+			etherpadInitMethods['${groupId}']();
+		});
+	}
+
 </script>
 
 <div class="etherpad-container" id='etherpad-container-${groupId}'></div>
Index: lams_tool_gmap/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc -r47af8921ff7d63addfeff2b9624c23fa0602bf63
--- lams_tool_gmap/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
+++ lams_tool_gmap/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 47af8921ff7d63addfeff2b9624c23fa0602bf63)
@@ -15,6 +15,7 @@
 <%@ attribute name="showChat" required="false" rtexprvalue="true" %>
 <%@ attribute name="height" required="false" rtexprvalue="true" %>
 <%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+<%@ attribute name="showOnDemand" required="false" rtexprvalue="true" %>
 
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
@@ -33,11 +34,15 @@
 <%-- THIS TAG REQUIRES JQUERY --%>
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
 <script type="text/javascript">
-	$(document).ready(function(){
+	var etherpadInitMethods = typeof etherpadInitMethods == 'undefined' ? {} : etherpadInitMethods;
+	etherpadInitMethods['${groupId}'] = function intialiseEtherpad() {
+		var showOnDemand = '${showOnDemand}' == 'true';
 		// If there are mutliple Etherpads on a single page, there is a race condition while setting session ID cookie.
 		// One of pads usually responds with "access denied". It is better to wait 1.5 seconds and initialise the next pad.
-		var delayBeforeInitialise = typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
-		lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		var delayBeforeInitialise = showOnDemand || typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
+		if (!showOnDemand) {
+			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		}
 		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
@@ -66,7 +71,6 @@
 				},
 				dataType : 'text',
 				success: function(padId, status, xhr) {
-					lamsEtherpadTagInitialising = false;
 					if ( status == "error" ) {
 						console.log( xhr.status + " " + xhr.statusText );
 					} else {
@@ -82,13 +86,20 @@
 								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
 								,'userName':'<c:out value="${fullName}" />'
 							</c:if>
-						});
+						}).addClass('initialised');
 					}
 				}
 			});
 			// wait for other pad on the page to initialise
 		}, delayBeforeInitialise);
-	});
+	}
+	
+	if ('${showOnDemand}' != 'true') {
+		$(document).ready(function(){
+			etherpadInitMethods['${groupId}']();
+		});
+	}
+
 </script>
 
 <div class="etherpad-container" id='etherpad-container-${groupId}'></div>
Index: lams_tool_images/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc -r47af8921ff7d63addfeff2b9624c23fa0602bf63
--- lams_tool_images/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
+++ lams_tool_images/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 47af8921ff7d63addfeff2b9624c23fa0602bf63)
@@ -15,6 +15,7 @@
 <%@ attribute name="showChat" required="false" rtexprvalue="true" %>
 <%@ attribute name="height" required="false" rtexprvalue="true" %>
 <%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+<%@ attribute name="showOnDemand" required="false" rtexprvalue="true" %>
 
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
@@ -33,11 +34,15 @@
 <%-- THIS TAG REQUIRES JQUERY --%>
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
 <script type="text/javascript">
-	$(document).ready(function(){
+	var etherpadInitMethods = typeof etherpadInitMethods == 'undefined' ? {} : etherpadInitMethods;
+	etherpadInitMethods['${groupId}'] = function intialiseEtherpad() {
+		var showOnDemand = '${showOnDemand}' == 'true';
 		// If there are mutliple Etherpads on a single page, there is a race condition while setting session ID cookie.
 		// One of pads usually responds with "access denied". It is better to wait 1.5 seconds and initialise the next pad.
-		var delayBeforeInitialise = typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
-		lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		var delayBeforeInitialise = showOnDemand || typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
+		if (!showOnDemand) {
+			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		}
 		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
@@ -66,7 +71,6 @@
 				},
 				dataType : 'text',
 				success: function(padId, status, xhr) {
-					lamsEtherpadTagInitialising = false;
 					if ( status == "error" ) {
 						console.log( xhr.status + " " + xhr.statusText );
 					} else {
@@ -82,13 +86,20 @@
 								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
 								,'userName':'<c:out value="${fullName}" />'
 							</c:if>
-						});
+						}).addClass('initialised');
 					}
 				}
 			});
 			// wait for other pad on the page to initialise
 		}, delayBeforeInitialise);
-	});
+	}
+	
+	if ('${showOnDemand}' != 'true') {
+		$(document).ready(function(){
+			etherpadInitMethods['${groupId}']();
+		});
+	}
+
 </script>
 
 <div class="etherpad-container" id='etherpad-container-${groupId}'></div>
Index: lams_tool_imscc/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc -r47af8921ff7d63addfeff2b9624c23fa0602bf63
--- lams_tool_imscc/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
+++ lams_tool_imscc/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 47af8921ff7d63addfeff2b9624c23fa0602bf63)
@@ -15,6 +15,7 @@
 <%@ attribute name="showChat" required="false" rtexprvalue="true" %>
 <%@ attribute name="height" required="false" rtexprvalue="true" %>
 <%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+<%@ attribute name="showOnDemand" required="false" rtexprvalue="true" %>
 
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
@@ -33,11 +34,15 @@
 <%-- THIS TAG REQUIRES JQUERY --%>
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
 <script type="text/javascript">
-	$(document).ready(function(){
+	var etherpadInitMethods = typeof etherpadInitMethods == 'undefined' ? {} : etherpadInitMethods;
+	etherpadInitMethods['${groupId}'] = function intialiseEtherpad() {
+		var showOnDemand = '${showOnDemand}' == 'true';
 		// If there are mutliple Etherpads on a single page, there is a race condition while setting session ID cookie.
 		// One of pads usually responds with "access denied". It is better to wait 1.5 seconds and initialise the next pad.
-		var delayBeforeInitialise = typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
-		lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		var delayBeforeInitialise = showOnDemand || typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
+		if (!showOnDemand) {
+			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		}
 		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
@@ -66,7 +71,6 @@
 				},
 				dataType : 'text',
 				success: function(padId, status, xhr) {
-					lamsEtherpadTagInitialising = false;
 					if ( status == "error" ) {
 						console.log( xhr.status + " " + xhr.statusText );
 					} else {
@@ -82,13 +86,20 @@
 								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
 								,'userName':'<c:out value="${fullName}" />'
 							</c:if>
-						});
+						}).addClass('initialised');
 					}
 				}
 			});
 			// wait for other pad on the page to initialise
 		}, delayBeforeInitialise);
-	});
+	}
+	
+	if ('${showOnDemand}' != 'true') {
+		$(document).ready(function(){
+			etherpadInitMethods['${groupId}']();
+		});
+	}
+
 </script>
 
 <div class="etherpad-container" id='etherpad-container-${groupId}'></div>
Index: lams_tool_lamc/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc -r47af8921ff7d63addfeff2b9624c23fa0602bf63
--- lams_tool_lamc/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
+++ lams_tool_lamc/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 47af8921ff7d63addfeff2b9624c23fa0602bf63)
@@ -15,6 +15,7 @@
 <%@ attribute name="showChat" required="false" rtexprvalue="true" %>
 <%@ attribute name="height" required="false" rtexprvalue="true" %>
 <%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+<%@ attribute name="showOnDemand" required="false" rtexprvalue="true" %>
 
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
@@ -33,11 +34,15 @@
 <%-- THIS TAG REQUIRES JQUERY --%>
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
 <script type="text/javascript">
-	$(document).ready(function(){
+	var etherpadInitMethods = typeof etherpadInitMethods == 'undefined' ? {} : etherpadInitMethods;
+	etherpadInitMethods['${groupId}'] = function intialiseEtherpad() {
+		var showOnDemand = '${showOnDemand}' == 'true';
 		// If there are mutliple Etherpads on a single page, there is a race condition while setting session ID cookie.
 		// One of pads usually responds with "access denied". It is better to wait 1.5 seconds and initialise the next pad.
-		var delayBeforeInitialise = typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
-		lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		var delayBeforeInitialise = showOnDemand || typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
+		if (!showOnDemand) {
+			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		}
 		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
@@ -66,7 +71,6 @@
 				},
 				dataType : 'text',
 				success: function(padId, status, xhr) {
-					lamsEtherpadTagInitialising = false;
 					if ( status == "error" ) {
 						console.log( xhr.status + " " + xhr.statusText );
 					} else {
@@ -82,13 +86,20 @@
 								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
 								,'userName':'<c:out value="${fullName}" />'
 							</c:if>
-						});
+						}).addClass('initialised');
 					}
 				}
 			});
 			// wait for other pad on the page to initialise
 		}, delayBeforeInitialise);
-	});
+	}
+	
+	if ('${showOnDemand}' != 'true') {
+		$(document).ready(function(){
+			etherpadInitMethods['${groupId}']();
+		});
+	}
+
 </script>
 
 <div class="etherpad-container" id='etherpad-container-${groupId}'></div>
Index: lams_tool_laqa/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc -r47af8921ff7d63addfeff2b9624c23fa0602bf63
--- lams_tool_laqa/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
+++ lams_tool_laqa/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 47af8921ff7d63addfeff2b9624c23fa0602bf63)
@@ -15,6 +15,7 @@
 <%@ attribute name="showChat" required="false" rtexprvalue="true" %>
 <%@ attribute name="height" required="false" rtexprvalue="true" %>
 <%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+<%@ attribute name="showOnDemand" required="false" rtexprvalue="true" %>
 
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
@@ -33,11 +34,15 @@
 <%-- THIS TAG REQUIRES JQUERY --%>
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
 <script type="text/javascript">
-	$(document).ready(function(){
+	var etherpadInitMethods = typeof etherpadInitMethods == 'undefined' ? {} : etherpadInitMethods;
+	etherpadInitMethods['${groupId}'] = function intialiseEtherpad() {
+		var showOnDemand = '${showOnDemand}' == 'true';
 		// If there are mutliple Etherpads on a single page, there is a race condition while setting session ID cookie.
 		// One of pads usually responds with "access denied". It is better to wait 1.5 seconds and initialise the next pad.
-		var delayBeforeInitialise = typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
-		lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		var delayBeforeInitialise = showOnDemand || typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
+		if (!showOnDemand) {
+			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		}
 		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
@@ -66,7 +71,6 @@
 				},
 				dataType : 'text',
 				success: function(padId, status, xhr) {
-					lamsEtherpadTagInitialising = false;
 					if ( status == "error" ) {
 						console.log( xhr.status + " " + xhr.statusText );
 					} else {
@@ -82,13 +86,20 @@
 								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
 								,'userName':'<c:out value="${fullName}" />'
 							</c:if>
-						});
+						}).addClass('initialised');
 					}
 				}
 			});
 			// wait for other pad on the page to initialise
 		}, delayBeforeInitialise);
-	});
+	}
+	
+	if ('${showOnDemand}' != 'true') {
+		$(document).ready(function(){
+			etherpadInitMethods['${groupId}']();
+		});
+	}
+
 </script>
 
 <div class="etherpad-container" id='etherpad-container-${groupId}'></div>
Index: lams_tool_larsrc/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc -r47af8921ff7d63addfeff2b9624c23fa0602bf63
--- lams_tool_larsrc/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
+++ lams_tool_larsrc/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 47af8921ff7d63addfeff2b9624c23fa0602bf63)
@@ -15,6 +15,7 @@
 <%@ attribute name="showChat" required="false" rtexprvalue="true" %>
 <%@ attribute name="height" required="false" rtexprvalue="true" %>
 <%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+<%@ attribute name="showOnDemand" required="false" rtexprvalue="true" %>
 
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
@@ -33,11 +34,15 @@
 <%-- THIS TAG REQUIRES JQUERY --%>
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
 <script type="text/javascript">
-	$(document).ready(function(){
+	var etherpadInitMethods = typeof etherpadInitMethods == 'undefined' ? {} : etherpadInitMethods;
+	etherpadInitMethods['${groupId}'] = function intialiseEtherpad() {
+		var showOnDemand = '${showOnDemand}' == 'true';
 		// If there are mutliple Etherpads on a single page, there is a race condition while setting session ID cookie.
 		// One of pads usually responds with "access denied". It is better to wait 1.5 seconds and initialise the next pad.
-		var delayBeforeInitialise = typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
-		lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		var delayBeforeInitialise = showOnDemand || typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
+		if (!showOnDemand) {
+			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		}
 		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
@@ -66,7 +71,6 @@
 				},
 				dataType : 'text',
 				success: function(padId, status, xhr) {
-					lamsEtherpadTagInitialising = false;
 					if ( status == "error" ) {
 						console.log( xhr.status + " " + xhr.statusText );
 					} else {
@@ -82,13 +86,20 @@
 								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
 								,'userName':'<c:out value="${fullName}" />'
 							</c:if>
-						});
+						}).addClass('initialised');
 					}
 				}
 			});
 			// wait for other pad on the page to initialise
 		}, delayBeforeInitialise);
-	});
+	}
+	
+	if ('${showOnDemand}' != 'true') {
+		$(document).ready(function(){
+			etherpadInitMethods['${groupId}']();
+		});
+	}
+
 </script>
 
 <div class="etherpad-container" id='etherpad-container-${groupId}'></div>
Index: lams_tool_leader/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc -r47af8921ff7d63addfeff2b9624c23fa0602bf63
--- lams_tool_leader/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
+++ lams_tool_leader/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 47af8921ff7d63addfeff2b9624c23fa0602bf63)
@@ -15,6 +15,7 @@
 <%@ attribute name="showChat" required="false" rtexprvalue="true" %>
 <%@ attribute name="height" required="false" rtexprvalue="true" %>
 <%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+<%@ attribute name="showOnDemand" required="false" rtexprvalue="true" %>
 
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
@@ -33,11 +34,15 @@
 <%-- THIS TAG REQUIRES JQUERY --%>
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
 <script type="text/javascript">
-	$(document).ready(function(){
+	var etherpadInitMethods = typeof etherpadInitMethods == 'undefined' ? {} : etherpadInitMethods;
+	etherpadInitMethods['${groupId}'] = function intialiseEtherpad() {
+		var showOnDemand = '${showOnDemand}' == 'true';
 		// If there are mutliple Etherpads on a single page, there is a race condition while setting session ID cookie.
 		// One of pads usually responds with "access denied". It is better to wait 1.5 seconds and initialise the next pad.
-		var delayBeforeInitialise = typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
-		lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		var delayBeforeInitialise = showOnDemand || typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
+		if (!showOnDemand) {
+			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		}
 		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
@@ -66,7 +71,6 @@
 				},
 				dataType : 'text',
 				success: function(padId, status, xhr) {
-					lamsEtherpadTagInitialising = false;
 					if ( status == "error" ) {
 						console.log( xhr.status + " " + xhr.statusText );
 					} else {
@@ -82,13 +86,20 @@
 								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
 								,'userName':'<c:out value="${fullName}" />'
 							</c:if>
-						});
+						}).addClass('initialised');
 					}
 				}
 			});
 			// wait for other pad on the page to initialise
 		}, delayBeforeInitialise);
-	});
+	}
+	
+	if ('${showOnDemand}' != 'true') {
+		$(document).ready(function(){
+			etherpadInitMethods['${groupId}']();
+		});
+	}
+
 </script>
 
 <div class="etherpad-container" id='etherpad-container-${groupId}'></div>
Index: lams_tool_mindmap/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc -r47af8921ff7d63addfeff2b9624c23fa0602bf63
--- lams_tool_mindmap/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
+++ lams_tool_mindmap/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 47af8921ff7d63addfeff2b9624c23fa0602bf63)
@@ -15,6 +15,7 @@
 <%@ attribute name="showChat" required="false" rtexprvalue="true" %>
 <%@ attribute name="height" required="false" rtexprvalue="true" %>
 <%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+<%@ attribute name="showOnDemand" required="false" rtexprvalue="true" %>
 
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
@@ -33,11 +34,15 @@
 <%-- THIS TAG REQUIRES JQUERY --%>
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
 <script type="text/javascript">
-	$(document).ready(function(){
+	var etherpadInitMethods = typeof etherpadInitMethods == 'undefined' ? {} : etherpadInitMethods;
+	etherpadInitMethods['${groupId}'] = function intialiseEtherpad() {
+		var showOnDemand = '${showOnDemand}' == 'true';
 		// If there are mutliple Etherpads on a single page, there is a race condition while setting session ID cookie.
 		// One of pads usually responds with "access denied". It is better to wait 1.5 seconds and initialise the next pad.
-		var delayBeforeInitialise = typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
-		lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		var delayBeforeInitialise = showOnDemand || typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
+		if (!showOnDemand) {
+			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		}
 		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
@@ -66,7 +71,6 @@
 				},
 				dataType : 'text',
 				success: function(padId, status, xhr) {
-					lamsEtherpadTagInitialising = false;
 					if ( status == "error" ) {
 						console.log( xhr.status + " " + xhr.statusText );
 					} else {
@@ -82,13 +86,20 @@
 								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
 								,'userName':'<c:out value="${fullName}" />'
 							</c:if>
-						});
+						}).addClass('initialised');
 					}
 				}
 			});
 			// wait for other pad on the page to initialise
 		}, delayBeforeInitialise);
-	});
+	}
+	
+	if ('${showOnDemand}' != 'true') {
+		$(document).ready(function(){
+			etherpadInitMethods['${groupId}']();
+		});
+	}
+
 </script>
 
 <div class="etherpad-container" id='etherpad-container-${groupId}'></div>
Index: lams_tool_nb/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc -r47af8921ff7d63addfeff2b9624c23fa0602bf63
--- lams_tool_nb/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
+++ lams_tool_nb/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 47af8921ff7d63addfeff2b9624c23fa0602bf63)
@@ -15,6 +15,7 @@
 <%@ attribute name="showChat" required="false" rtexprvalue="true" %>
 <%@ attribute name="height" required="false" rtexprvalue="true" %>
 <%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+<%@ attribute name="showOnDemand" required="false" rtexprvalue="true" %>
 
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
@@ -33,11 +34,15 @@
 <%-- THIS TAG REQUIRES JQUERY --%>
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
 <script type="text/javascript">
-	$(document).ready(function(){
+	var etherpadInitMethods = typeof etherpadInitMethods == 'undefined' ? {} : etherpadInitMethods;
+	etherpadInitMethods['${groupId}'] = function intialiseEtherpad() {
+		var showOnDemand = '${showOnDemand}' == 'true';
 		// If there are mutliple Etherpads on a single page, there is a race condition while setting session ID cookie.
 		// One of pads usually responds with "access denied". It is better to wait 1.5 seconds and initialise the next pad.
-		var delayBeforeInitialise = typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
-		lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		var delayBeforeInitialise = showOnDemand || typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
+		if (!showOnDemand) {
+			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		}
 		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
@@ -66,7 +71,6 @@
 				},
 				dataType : 'text',
 				success: function(padId, status, xhr) {
-					lamsEtherpadTagInitialising = false;
 					if ( status == "error" ) {
 						console.log( xhr.status + " " + xhr.statusText );
 					} else {
@@ -82,13 +86,20 @@
 								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
 								,'userName':'<c:out value="${fullName}" />'
 							</c:if>
-						});
+						}).addClass('initialised');
 					}
 				}
 			});
 			// wait for other pad on the page to initialise
 		}, delayBeforeInitialise);
-	});
+	}
+	
+	if ('${showOnDemand}' != 'true') {
+		$(document).ready(function(){
+			etherpadInitMethods['${groupId}']();
+		});
+	}
+
 </script>
 
 <div class="etherpad-container" id='etherpad-container-${groupId}'></div>
Index: lams_tool_notebook/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc -r47af8921ff7d63addfeff2b9624c23fa0602bf63
--- lams_tool_notebook/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
+++ lams_tool_notebook/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 47af8921ff7d63addfeff2b9624c23fa0602bf63)
@@ -15,6 +15,7 @@
 <%@ attribute name="showChat" required="false" rtexprvalue="true" %>
 <%@ attribute name="height" required="false" rtexprvalue="true" %>
 <%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+<%@ attribute name="showOnDemand" required="false" rtexprvalue="true" %>
 
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
@@ -33,11 +34,15 @@
 <%-- THIS TAG REQUIRES JQUERY --%>
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
 <script type="text/javascript">
-	$(document).ready(function(){
+	var etherpadInitMethods = typeof etherpadInitMethods == 'undefined' ? {} : etherpadInitMethods;
+	etherpadInitMethods['${groupId}'] = function intialiseEtherpad() {
+		var showOnDemand = '${showOnDemand}' == 'true';
 		// If there are mutliple Etherpads on a single page, there is a race condition while setting session ID cookie.
 		// One of pads usually responds with "access denied". It is better to wait 1.5 seconds and initialise the next pad.
-		var delayBeforeInitialise = typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
-		lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		var delayBeforeInitialise = showOnDemand || typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
+		if (!showOnDemand) {
+			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		}
 		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
@@ -66,7 +71,6 @@
 				},
 				dataType : 'text',
 				success: function(padId, status, xhr) {
-					lamsEtherpadTagInitialising = false;
 					if ( status == "error" ) {
 						console.log( xhr.status + " " + xhr.statusText );
 					} else {
@@ -82,13 +86,20 @@
 								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
 								,'userName':'<c:out value="${fullName}" />'
 							</c:if>
-						});
+						}).addClass('initialised');
 					}
 				}
 			});
 			// wait for other pad on the page to initialise
 		}, delayBeforeInitialise);
-	});
+	}
+	
+	if ('${showOnDemand}' != 'true') {
+		$(document).ready(function(){
+			etherpadInitMethods['${groupId}']();
+		});
+	}
+
 </script>
 
 <div class="etherpad-container" id='etherpad-container-${groupId}'></div>
Index: lams_tool_pixlr/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc -r47af8921ff7d63addfeff2b9624c23fa0602bf63
--- lams_tool_pixlr/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
+++ lams_tool_pixlr/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 47af8921ff7d63addfeff2b9624c23fa0602bf63)
@@ -15,6 +15,7 @@
 <%@ attribute name="showChat" required="false" rtexprvalue="true" %>
 <%@ attribute name="height" required="false" rtexprvalue="true" %>
 <%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+<%@ attribute name="showOnDemand" required="false" rtexprvalue="true" %>
 
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
@@ -33,11 +34,15 @@
 <%-- THIS TAG REQUIRES JQUERY --%>
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
 <script type="text/javascript">
-	$(document).ready(function(){
+	var etherpadInitMethods = typeof etherpadInitMethods == 'undefined' ? {} : etherpadInitMethods;
+	etherpadInitMethods['${groupId}'] = function intialiseEtherpad() {
+		var showOnDemand = '${showOnDemand}' == 'true';
 		// If there are mutliple Etherpads on a single page, there is a race condition while setting session ID cookie.
 		// One of pads usually responds with "access denied". It is better to wait 1.5 seconds and initialise the next pad.
-		var delayBeforeInitialise = typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
-		lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		var delayBeforeInitialise = showOnDemand || typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
+		if (!showOnDemand) {
+			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		}
 		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
@@ -66,7 +71,6 @@
 				},
 				dataType : 'text',
 				success: function(padId, status, xhr) {
-					lamsEtherpadTagInitialising = false;
 					if ( status == "error" ) {
 						console.log( xhr.status + " " + xhr.statusText );
 					} else {
@@ -82,13 +86,20 @@
 								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
 								,'userName':'<c:out value="${fullName}" />'
 							</c:if>
-						});
+						}).addClass('initialised');
 					}
 				}
 			});
 			// wait for other pad on the page to initialise
 		}, delayBeforeInitialise);
-	});
+	}
+	
+	if ('${showOnDemand}' != 'true') {
+		$(document).ready(function(){
+			etherpadInitMethods['${groupId}']();
+		});
+	}
+
 </script>
 
 <div class="etherpad-container" id='etherpad-container-${groupId}'></div>
Index: lams_tool_preview/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc -r47af8921ff7d63addfeff2b9624c23fa0602bf63
--- lams_tool_preview/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
+++ lams_tool_preview/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 47af8921ff7d63addfeff2b9624c23fa0602bf63)
@@ -15,6 +15,7 @@
 <%@ attribute name="showChat" required="false" rtexprvalue="true" %>
 <%@ attribute name="height" required="false" rtexprvalue="true" %>
 <%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+<%@ attribute name="showOnDemand" required="false" rtexprvalue="true" %>
 
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
@@ -33,11 +34,15 @@
 <%-- THIS TAG REQUIRES JQUERY --%>
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
 <script type="text/javascript">
-	$(document).ready(function(){
+	var etherpadInitMethods = typeof etherpadInitMethods == 'undefined' ? {} : etherpadInitMethods;
+	etherpadInitMethods['${groupId}'] = function intialiseEtherpad() {
+		var showOnDemand = '${showOnDemand}' == 'true';
 		// If there are mutliple Etherpads on a single page, there is a race condition while setting session ID cookie.
 		// One of pads usually responds with "access denied". It is better to wait 1.5 seconds and initialise the next pad.
-		var delayBeforeInitialise = typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
-		lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		var delayBeforeInitialise = showOnDemand || typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
+		if (!showOnDemand) {
+			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		}
 		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
@@ -66,7 +71,6 @@
 				},
 				dataType : 'text',
 				success: function(padId, status, xhr) {
-					lamsEtherpadTagInitialising = false;
 					if ( status == "error" ) {
 						console.log( xhr.status + " " + xhr.statusText );
 					} else {
@@ -82,13 +86,20 @@
 								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
 								,'userName':'<c:out value="${fullName}" />'
 							</c:if>
-						});
+						}).addClass('initialised');
 					}
 				}
 			});
 			// wait for other pad on the page to initialise
 		}, delayBeforeInitialise);
-	});
+	}
+	
+	if ('${showOnDemand}' != 'true') {
+		$(document).ready(function(){
+			etherpadInitMethods['${groupId}']();
+		});
+	}
+
 </script>
 
 <div class="etherpad-container" id='etherpad-container-${groupId}'></div>
Index: lams_tool_sbmt/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc -r47af8921ff7d63addfeff2b9624c23fa0602bf63
--- lams_tool_sbmt/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
+++ lams_tool_sbmt/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 47af8921ff7d63addfeff2b9624c23fa0602bf63)
@@ -15,6 +15,7 @@
 <%@ attribute name="showChat" required="false" rtexprvalue="true" %>
 <%@ attribute name="height" required="false" rtexprvalue="true" %>
 <%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+<%@ attribute name="showOnDemand" required="false" rtexprvalue="true" %>
 
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
@@ -33,11 +34,15 @@
 <%-- THIS TAG REQUIRES JQUERY --%>
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
 <script type="text/javascript">
-	$(document).ready(function(){
+	var etherpadInitMethods = typeof etherpadInitMethods == 'undefined' ? {} : etherpadInitMethods;
+	etherpadInitMethods['${groupId}'] = function intialiseEtherpad() {
+		var showOnDemand = '${showOnDemand}' == 'true';
 		// If there are mutliple Etherpads on a single page, there is a race condition while setting session ID cookie.
 		// One of pads usually responds with "access denied". It is better to wait 1.5 seconds and initialise the next pad.
-		var delayBeforeInitialise = typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
-		lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		var delayBeforeInitialise = showOnDemand || typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
+		if (!showOnDemand) {
+			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		}
 		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
@@ -66,7 +71,6 @@
 				},
 				dataType : 'text',
 				success: function(padId, status, xhr) {
-					lamsEtherpadTagInitialising = false;
 					if ( status == "error" ) {
 						console.log( xhr.status + " " + xhr.statusText );
 					} else {
@@ -82,13 +86,20 @@
 								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
 								,'userName':'<c:out value="${fullName}" />'
 							</c:if>
-						});
+						}).addClass('initialised');
 					}
 				}
 			});
 			// wait for other pad on the page to initialise
 		}, delayBeforeInitialise);
-	});
+	}
+	
+	if ('${showOnDemand}' != 'true') {
+		$(document).ready(function(){
+			etherpadInitMethods['${groupId}']();
+		});
+	}
+
 </script>
 
 <div class="etherpad-container" id='etherpad-container-${groupId}'></div>
Index: lams_tool_scratchie/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc -r47af8921ff7d63addfeff2b9624c23fa0602bf63
--- lams_tool_scratchie/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
+++ lams_tool_scratchie/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 47af8921ff7d63addfeff2b9624c23fa0602bf63)
@@ -15,6 +15,7 @@
 <%@ attribute name="showChat" required="false" rtexprvalue="true" %>
 <%@ attribute name="height" required="false" rtexprvalue="true" %>
 <%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+<%@ attribute name="showOnDemand" required="false" rtexprvalue="true" %>
 
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
@@ -33,11 +34,15 @@
 <%-- THIS TAG REQUIRES JQUERY --%>
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
 <script type="text/javascript">
-	$(document).ready(function(){
+	var etherpadInitMethods = typeof etherpadInitMethods == 'undefined' ? {} : etherpadInitMethods;
+	etherpadInitMethods['${groupId}'] = function intialiseEtherpad() {
+		var showOnDemand = '${showOnDemand}' == 'true';
 		// If there are mutliple Etherpads on a single page, there is a race condition while setting session ID cookie.
 		// One of pads usually responds with "access denied". It is better to wait 1.5 seconds and initialise the next pad.
-		var delayBeforeInitialise = typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
-		lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		var delayBeforeInitialise = showOnDemand || typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
+		if (!showOnDemand) {
+			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		}
 		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
@@ -66,7 +71,6 @@
 				},
 				dataType : 'text',
 				success: function(padId, status, xhr) {
-					lamsEtherpadTagInitialising = false;
 					if ( status == "error" ) {
 						console.log( xhr.status + " " + xhr.statusText );
 					} else {
@@ -82,13 +86,20 @@
 								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
 								,'userName':'<c:out value="${fullName}" />'
 							</c:if>
-						});
+						}).addClass('initialised');
 					}
 				}
 			});
 			// wait for other pad on the page to initialise
 		}, delayBeforeInitialise);
-	});
+	}
+	
+	if ('${showOnDemand}' != 'true') {
+		$(document).ready(function(){
+			etherpadInitMethods['${groupId}']();
+		});
+	}
+
 </script>
 
 <div class="etherpad-container" id='etherpad-container-${groupId}'></div>
Index: lams_tool_scratchie/web/pages/learning/learning.jsp
===================================================================
diff -u -r7d85ffe5b7c94a312a72f170dff863cc04bc352f -r47af8921ff7d63addfeff2b9624c23fa0602bf63
--- lams_tool_scratchie/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 7d85ffe5b7c94a312a72f170dff863cc04bc352f)
+++ lams_tool_scratchie/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 47af8921ff7d63addfeff2b9624c23fa0602bf63)
@@ -72,6 +72,16 @@
 					'minLength' : 3
 				});
 			});
+			
+			// show etherpads only on Discussion expand
+			$('.question-etherpad-collapse').on('show.bs.collapse', function(){
+				var etherpad = $('.etherpad-container', this);
+				if (!etherpad.hasClass('initialised')) {
+					var id = etherpad.attr('id'),
+						groupId = id.substring('etherpad-container-'.length);
+					etherpadInitMethods[groupId]();
+				}
+			});
 		});
 
 		//scratch image (used by both scratchMcq() and scratchVsa())
Index: lams_tool_scratchie/web/pages/learning/scratchies.jsp
===================================================================
diff -u -re423418cca5e77a3b54cb3be496b67abe01c4183 -r47af8921ff7d63addfeff2b9624c23fa0602bf63
--- lams_tool_scratchie/web/pages/learning/scratchies.jsp	(.../scratchies.jsp)	(revision e423418cca5e77a3b54cb3be496b67abe01c4183)
+++ lams_tool_scratchie/web/pages/learning/scratchies.jsp	(.../scratchies.jsp)	(revision 47af8921ff7d63addfeff2b9624c23fa0602bf63)
@@ -169,10 +169,10 @@
 				<fmt:message key="label.etherpad.discussion" />
 			</a>
 			
-			<div id="question-etherpad-${item.uid}" class="collapse">
+			<div id="question-etherpad-${item.uid}" class="question-etherpad-collapse collapse">
 				<div class="panel panel-default question-etherpad">
 					<lams:Etherpad groupId="etherpad-scratchie-${toolSessionID}-question-${item.uid}" 
-					   showControls="${mode eq 'teacher'}" showChat="false" heightAutoGrow="true"
+					   showControls="${mode eq 'teacher'}" showChat="false" heightAutoGrow="true" showOnDemand="true"
 					>${questionEtherpadContent}</lams:Etherpad>
 				</div>
 			</div>
Index: lams_tool_scribe/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc -r47af8921ff7d63addfeff2b9624c23fa0602bf63
--- lams_tool_scribe/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
+++ lams_tool_scribe/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 47af8921ff7d63addfeff2b9624c23fa0602bf63)
@@ -15,6 +15,7 @@
 <%@ attribute name="showChat" required="false" rtexprvalue="true" %>
 <%@ attribute name="height" required="false" rtexprvalue="true" %>
 <%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+<%@ attribute name="showOnDemand" required="false" rtexprvalue="true" %>
 
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
@@ -33,11 +34,15 @@
 <%-- THIS TAG REQUIRES JQUERY --%>
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
 <script type="text/javascript">
-	$(document).ready(function(){
+	var etherpadInitMethods = typeof etherpadInitMethods == 'undefined' ? {} : etherpadInitMethods;
+	etherpadInitMethods['${groupId}'] = function intialiseEtherpad() {
+		var showOnDemand = '${showOnDemand}' == 'true';
 		// If there are mutliple Etherpads on a single page, there is a race condition while setting session ID cookie.
 		// One of pads usually responds with "access denied". It is better to wait 1.5 seconds and initialise the next pad.
-		var delayBeforeInitialise = typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
-		lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		var delayBeforeInitialise = showOnDemand || typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
+		if (!showOnDemand) {
+			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		}
 		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
@@ -66,7 +71,6 @@
 				},
 				dataType : 'text',
 				success: function(padId, status, xhr) {
-					lamsEtherpadTagInitialising = false;
 					if ( status == "error" ) {
 						console.log( xhr.status + " " + xhr.statusText );
 					} else {
@@ -82,13 +86,20 @@
 								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
 								,'userName':'<c:out value="${fullName}" />'
 							</c:if>
-						});
+						}).addClass('initialised');
 					}
 				}
 			});
 			// wait for other pad on the page to initialise
 		}, delayBeforeInitialise);
-	});
+	}
+	
+	if ('${showOnDemand}' != 'true') {
+		$(document).ready(function(){
+			etherpadInitMethods['${groupId}']();
+		});
+	}
+
 </script>
 
 <div class="etherpad-container" id='etherpad-container-${groupId}'></div>
Index: lams_tool_spreadsheet/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc -r47af8921ff7d63addfeff2b9624c23fa0602bf63
--- lams_tool_spreadsheet/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 47af8921ff7d63addfeff2b9624c23fa0602bf63)
@@ -15,6 +15,7 @@
 <%@ attribute name="showChat" required="false" rtexprvalue="true" %>
 <%@ attribute name="height" required="false" rtexprvalue="true" %>
 <%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+<%@ attribute name="showOnDemand" required="false" rtexprvalue="true" %>
 
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
@@ -33,11 +34,15 @@
 <%-- THIS TAG REQUIRES JQUERY --%>
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
 <script type="text/javascript">
-	$(document).ready(function(){
+	var etherpadInitMethods = typeof etherpadInitMethods == 'undefined' ? {} : etherpadInitMethods;
+	etherpadInitMethods['${groupId}'] = function intialiseEtherpad() {
+		var showOnDemand = '${showOnDemand}' == 'true';
 		// If there are mutliple Etherpads on a single page, there is a race condition while setting session ID cookie.
 		// One of pads usually responds with "access denied". It is better to wait 1.5 seconds and initialise the next pad.
-		var delayBeforeInitialise = typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
-		lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		var delayBeforeInitialise = showOnDemand || typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
+		if (!showOnDemand) {
+			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		}
 		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
@@ -66,7 +71,6 @@
 				},
 				dataType : 'text',
 				success: function(padId, status, xhr) {
-					lamsEtherpadTagInitialising = false;
 					if ( status == "error" ) {
 						console.log( xhr.status + " " + xhr.statusText );
 					} else {
@@ -82,13 +86,20 @@
 								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
 								,'userName':'<c:out value="${fullName}" />'
 							</c:if>
-						});
+						}).addClass('initialised');
 					}
 				}
 			});
 			// wait for other pad on the page to initialise
 		}, delayBeforeInitialise);
-	});
+	}
+	
+	if ('${showOnDemand}' != 'true') {
+		$(document).ready(function(){
+			etherpadInitMethods['${groupId}']();
+		});
+	}
+
 </script>
 
 <div class="etherpad-container" id='etherpad-container-${groupId}'></div>
Index: lams_tool_survey/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc -r47af8921ff7d63addfeff2b9624c23fa0602bf63
--- lams_tool_survey/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
+++ lams_tool_survey/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 47af8921ff7d63addfeff2b9624c23fa0602bf63)
@@ -15,6 +15,7 @@
 <%@ attribute name="showChat" required="false" rtexprvalue="true" %>
 <%@ attribute name="height" required="false" rtexprvalue="true" %>
 <%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+<%@ attribute name="showOnDemand" required="false" rtexprvalue="true" %>
 
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
@@ -33,11 +34,15 @@
 <%-- THIS TAG REQUIRES JQUERY --%>
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
 <script type="text/javascript">
-	$(document).ready(function(){
+	var etherpadInitMethods = typeof etherpadInitMethods == 'undefined' ? {} : etherpadInitMethods;
+	etherpadInitMethods['${groupId}'] = function intialiseEtherpad() {
+		var showOnDemand = '${showOnDemand}' == 'true';
 		// If there are mutliple Etherpads on a single page, there is a race condition while setting session ID cookie.
 		// One of pads usually responds with "access denied". It is better to wait 1.5 seconds and initialise the next pad.
-		var delayBeforeInitialise = typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
-		lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		var delayBeforeInitialise = showOnDemand || typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
+		if (!showOnDemand) {
+			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		}
 		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
@@ -66,7 +71,6 @@
 				},
 				dataType : 'text',
 				success: function(padId, status, xhr) {
-					lamsEtherpadTagInitialising = false;
 					if ( status == "error" ) {
 						console.log( xhr.status + " " + xhr.statusText );
 					} else {
@@ -82,13 +86,20 @@
 								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
 								,'userName':'<c:out value="${fullName}" />'
 							</c:if>
-						});
+						}).addClass('initialised');
 					}
 				}
 			});
 			// wait for other pad on the page to initialise
 		}, delayBeforeInitialise);
-	});
+	}
+	
+	if ('${showOnDemand}' != 'true') {
+		$(document).ready(function(){
+			etherpadInitMethods['${groupId}']();
+		});
+	}
+
 </script>
 
 <div class="etherpad-container" id='etherpad-container-${groupId}'></div>
Index: lams_tool_task/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc -r47af8921ff7d63addfeff2b9624c23fa0602bf63
--- lams_tool_task/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
+++ lams_tool_task/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 47af8921ff7d63addfeff2b9624c23fa0602bf63)
@@ -15,6 +15,7 @@
 <%@ attribute name="showChat" required="false" rtexprvalue="true" %>
 <%@ attribute name="height" required="false" rtexprvalue="true" %>
 <%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+<%@ attribute name="showOnDemand" required="false" rtexprvalue="true" %>
 
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
@@ -33,11 +34,15 @@
 <%-- THIS TAG REQUIRES JQUERY --%>
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
 <script type="text/javascript">
-	$(document).ready(function(){
+	var etherpadInitMethods = typeof etherpadInitMethods == 'undefined' ? {} : etherpadInitMethods;
+	etherpadInitMethods['${groupId}'] = function intialiseEtherpad() {
+		var showOnDemand = '${showOnDemand}' == 'true';
 		// If there are mutliple Etherpads on a single page, there is a race condition while setting session ID cookie.
 		// One of pads usually responds with "access denied". It is better to wait 1.5 seconds and initialise the next pad.
-		var delayBeforeInitialise = typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
-		lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		var delayBeforeInitialise = showOnDemand || typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
+		if (!showOnDemand) {
+			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		}
 		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
@@ -66,7 +71,6 @@
 				},
 				dataType : 'text',
 				success: function(padId, status, xhr) {
-					lamsEtherpadTagInitialising = false;
 					if ( status == "error" ) {
 						console.log( xhr.status + " " + xhr.statusText );
 					} else {
@@ -82,13 +86,20 @@
 								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
 								,'userName':'<c:out value="${fullName}" />'
 							</c:if>
-						});
+						}).addClass('initialised');
 					}
 				}
 			});
 			// wait for other pad on the page to initialise
 		}, delayBeforeInitialise);
-	});
+	}
+	
+	if ('${showOnDemand}' != 'true') {
+		$(document).ready(function(){
+			etherpadInitMethods['${groupId}']();
+		});
+	}
+
 </script>
 
 <div class="etherpad-container" id='etherpad-container-${groupId}'></div>
Index: lams_tool_vote/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc -r47af8921ff7d63addfeff2b9624c23fa0602bf63
--- lams_tool_vote/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
+++ lams_tool_vote/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 47af8921ff7d63addfeff2b9624c23fa0602bf63)
@@ -15,6 +15,7 @@
 <%@ attribute name="showChat" required="false" rtexprvalue="true" %>
 <%@ attribute name="height" required="false" rtexprvalue="true" %>
 <%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+<%@ attribute name="showOnDemand" required="false" rtexprvalue="true" %>
 
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
@@ -33,11 +34,15 @@
 <%-- THIS TAG REQUIRES JQUERY --%>
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
 <script type="text/javascript">
-	$(document).ready(function(){
+	var etherpadInitMethods = typeof etherpadInitMethods == 'undefined' ? {} : etherpadInitMethods;
+	etherpadInitMethods['${groupId}'] = function intialiseEtherpad() {
+		var showOnDemand = '${showOnDemand}' == 'true';
 		// If there are mutliple Etherpads on a single page, there is a race condition while setting session ID cookie.
 		// One of pads usually responds with "access denied". It is better to wait 1.5 seconds and initialise the next pad.
-		var delayBeforeInitialise = typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
-		lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		var delayBeforeInitialise = showOnDemand || typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
+		if (!showOnDemand) {
+			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		}
 		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
@@ -66,7 +71,6 @@
 				},
 				dataType : 'text',
 				success: function(padId, status, xhr) {
-					lamsEtherpadTagInitialising = false;
 					if ( status == "error" ) {
 						console.log( xhr.status + " " + xhr.statusText );
 					} else {
@@ -82,13 +86,20 @@
 								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
 								,'userName':'<c:out value="${fullName}" />'
 							</c:if>
-						});
+						}).addClass('initialised');
 					}
 				}
 			});
 			// wait for other pad on the page to initialise
 		}, delayBeforeInitialise);
-	});
+	}
+	
+	if ('${showOnDemand}' != 'true') {
+		$(document).ready(function(){
+			etherpadInitMethods['${groupId}']();
+		});
+	}
+
 </script>
 
 <div class="etherpad-container" id='etherpad-container-${groupId}'></div>
Index: lams_tool_wiki/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc -r47af8921ff7d63addfeff2b9624c23fa0602bf63
--- lams_tool_wiki/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
+++ lams_tool_wiki/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 47af8921ff7d63addfeff2b9624c23fa0602bf63)
@@ -15,6 +15,7 @@
 <%@ attribute name="showChat" required="false" rtexprvalue="true" %>
 <%@ attribute name="height" required="false" rtexprvalue="true" %>
 <%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+<%@ attribute name="showOnDemand" required="false" rtexprvalue="true" %>
 
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
@@ -33,11 +34,15 @@
 <%-- THIS TAG REQUIRES JQUERY --%>
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
 <script type="text/javascript">
-	$(document).ready(function(){
+	var etherpadInitMethods = typeof etherpadInitMethods == 'undefined' ? {} : etherpadInitMethods;
+	etherpadInitMethods['${groupId}'] = function intialiseEtherpad() {
+		var showOnDemand = '${showOnDemand}' == 'true';
 		// If there are mutliple Etherpads on a single page, there is a race condition while setting session ID cookie.
 		// One of pads usually responds with "access denied". It is better to wait 1.5 seconds and initialise the next pad.
-		var delayBeforeInitialise = typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
-		lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		var delayBeforeInitialise = showOnDemand || typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
+		if (!showOnDemand) {
+			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		}
 		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
@@ -66,7 +71,6 @@
 				},
 				dataType : 'text',
 				success: function(padId, status, xhr) {
-					lamsEtherpadTagInitialising = false;
 					if ( status == "error" ) {
 						console.log( xhr.status + " " + xhr.statusText );
 					} else {
@@ -82,13 +86,20 @@
 								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
 								,'userName':'<c:out value="${fullName}" />'
 							</c:if>
-						});
+						}).addClass('initialised');
 					}
 				}
 			});
 			// wait for other pad on the page to initialise
 		}, delayBeforeInitialise);
-	});
+	}
+	
+	if ('${showOnDemand}' != 'true') {
+		$(document).ready(function(){
+			etherpadInitMethods['${groupId}']();
+		});
+	}
+
 </script>
 
 <div class="etherpad-container" id='etherpad-container-${groupId}'></div>
Index: lams_tool_zoom/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc -r47af8921ff7d63addfeff2b9624c23fa0602bf63
--- lams_tool_zoom/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
+++ lams_tool_zoom/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 47af8921ff7d63addfeff2b9624c23fa0602bf63)
@@ -15,6 +15,7 @@
 <%@ attribute name="showChat" required="false" rtexprvalue="true" %>
 <%@ attribute name="height" required="false" rtexprvalue="true" %>
 <%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+<%@ attribute name="showOnDemand" required="false" rtexprvalue="true" %>
 
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
@@ -33,11 +34,15 @@
 <%-- THIS TAG REQUIRES JQUERY --%>
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
 <script type="text/javascript">
-	$(document).ready(function(){
+	var etherpadInitMethods = typeof etherpadInitMethods == 'undefined' ? {} : etherpadInitMethods;
+	etherpadInitMethods['${groupId}'] = function intialiseEtherpad() {
+		var showOnDemand = '${showOnDemand}' == 'true';
 		// If there are mutliple Etherpads on a single page, there is a race condition while setting session ID cookie.
 		// One of pads usually responds with "access denied". It is better to wait 1.5 seconds and initialise the next pad.
-		var delayBeforeInitialise = typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
-		lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		var delayBeforeInitialise = showOnDemand || typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
+		if (!showOnDemand) {
+			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		}
 		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
@@ -66,7 +71,6 @@
 				},
 				dataType : 'text',
 				success: function(padId, status, xhr) {
-					lamsEtherpadTagInitialising = false;
 					if ( status == "error" ) {
 						console.log( xhr.status + " " + xhr.statusText );
 					} else {
@@ -82,13 +86,20 @@
 								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
 								,'userName':'<c:out value="${fullName}" />'
 							</c:if>
-						});
+						}).addClass('initialised');
 					}
 				}
 			});
 			// wait for other pad on the page to initialise
 		}, delayBeforeInitialise);
-	});
+	}
+	
+	if ('${showOnDemand}' != 'true') {
+		$(document).ready(function(){
+			etherpadInitMethods['${groupId}']();
+		});
+	}
+
 </script>
 
 <div class="etherpad-container" id='etherpad-container-${groupId}'></div>
Index: lams_www/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc -r47af8921ff7d63addfeff2b9624c23fa0602bf63
--- lams_www/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
+++ lams_www/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 47af8921ff7d63addfeff2b9624c23fa0602bf63)
@@ -15,6 +15,7 @@
 <%@ attribute name="showChat" required="false" rtexprvalue="true" %>
 <%@ attribute name="height" required="false" rtexprvalue="true" %>
 <%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+<%@ attribute name="showOnDemand" required="false" rtexprvalue="true" %>
 
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
@@ -33,11 +34,15 @@
 <%-- THIS TAG REQUIRES JQUERY --%>
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
 <script type="text/javascript">
-	$(document).ready(function(){
+	var etherpadInitMethods = typeof etherpadInitMethods == 'undefined' ? {} : etherpadInitMethods;
+	etherpadInitMethods['${groupId}'] = function intialiseEtherpad() {
+		var showOnDemand = '${showOnDemand}' == 'true';
 		// If there are mutliple Etherpads on a single page, there is a race condition while setting session ID cookie.
 		// One of pads usually responds with "access denied". It is better to wait 1.5 seconds and initialise the next pad.
-		var delayBeforeInitialise = typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
-		lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		var delayBeforeInitialise = showOnDemand || typeof lamsEtherpadTagInitialiseDelay == 'undefined' ? 0 : lamsEtherpadTagInitialiseDelay;
+		if (!showOnDemand) {
+			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
+		}
 		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
@@ -66,7 +71,6 @@
 				},
 				dataType : 'text',
 				success: function(padId, status, xhr) {
-					lamsEtherpadTagInitialising = false;
 					if ( status == "error" ) {
 						console.log( xhr.status + " " + xhr.statusText );
 					} else {
@@ -82,13 +86,20 @@
 								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
 								,'userName':'<c:out value="${fullName}" />'
 							</c:if>
-						});
+						}).addClass('initialised');
 					}
 				}
 			});
 			// wait for other pad on the page to initialise
 		}, delayBeforeInitialise);
-	});
+	}
+	
+	if ('${showOnDemand}' != 'true') {
+		$(document).ready(function(){
+			etherpadInitMethods['${groupId}']();
+		});
+	}
+
 </script>
 
 <div class="etherpad-container" id='etherpad-container-${groupId}'></div>