Index: lams_tool_doku/web/pages/learning/learning.jsp
===================================================================
diff -u -r5648803ecd6be1b5c3e62d8a574bb1fd39661110 -r05bfcee641d987d309a98c5f28f23a01075e8779
--- lams_tool_doku/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 5648803ecd6be1b5c3e62d8a574bb1fd39661110)
+++ lams_tool_doku/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 05bfcee641d987d309a98c5f28f23a01075e8779)
@@ -41,6 +41,19 @@
 	<script type="text/javascript" src="${lams}includes/javascript/etherpad.js"></script>
 	<script type="text/javascript">
 		$(document).ready(function(){
+			// Resize Etherpad iframe when its content grows.
+			// It does not support shrinking, only growing.
+			// This feature requires ep_resize plugin installed in Etherpad and customised with code in Doku tool
+			$(window).on('message onmessage', function (e) {
+				var msg = e.originalEvent.data;
+		        if (msg.name === 'ep_resize') {
+		        	var src = msg.data.location.substring(0, msg.data.location.indexOf('?')),
+		        		iframe = $('iframe[src^="' + src + '"]'),
+		            	// height should be no less than 200 px
+		            	height = Math.max(200, msg.data.height - ${hasEditRight ? 0 : 72});
+		           	iframe.height(height);
+		        }
+		    });
 			
 			$('#etherpad-container').pad({
 				'padId':'${padId}',
Index: lams_tool_doku/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r5648803ecd6be1b5c3e62d8a574bb1fd39661110 -r05bfcee641d987d309a98c5f28f23a01075e8779
--- lams_tool_doku/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 5648803ecd6be1b5c3e62d8a574bb1fd39661110)
+++ lams_tool_doku/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 05bfcee641d987d309a98c5f28f23a01075e8779)
@@ -58,6 +58,19 @@
 	var isCountdownStarted = ${not empty dokumaran.timeLimitLaunchedDate};
 	
 	$(document).ready(function(){
+		// Resize Etherpad iframe when its content grows.
+		// It does not support shrinking, only growing.
+		// This feature requires ep_resize plugin installed in Etherpad and customised with code in Doku tool
+		$(window).on('message onmessage', function (e) {
+			var msg = e.originalEvent.data;
+	        if (msg.name === 'ep_resize') {
+	        	var src = msg.data.location.substring(0, msg.data.location.indexOf('?')),
+	        		iframe = $('iframe[src^="' + src + '"]'),
+	            	// height should be no less than 200 px
+	            	height = Math.max(200, msg.data.height);
+	           	iframe.height(height);
+	        }
+	    });
 		
 		<c:forEach var="groupSummary" items="${summaryList}" varStatus="status">
 			$('#etherpad-container-${groupSummary.sessionId}').pad({
@@ -203,11 +216,6 @@
 			$('#countdown').countdown('pause');
 		}
 	}
-	
-	function showTimeSlider(toolSessionId, padId) {
-		$('#etherpad-container-' + toolSessionId).html("<iframe src='${etherpadServerUrl}/p/" + padId + "/timeslider' width='100%' height='316'><iframe>");
-	}
-
 </script>
 
 <div class="panel">
@@ -282,12 +290,6 @@
 		</c:when>
 		<c:otherwise>
 			<div class="btn-group btn-group-xs pull-right">
-				<a href="#nogo" onclick="showTimeSlider(${groupSummary.sessionId}, '${groupSummary.padId}')" class="btn btn-default btn-sm "
-						title="<fmt:message key="label.timeslider" />">
-					<i class="fa fa-lg fa-clock-o"></i>
-					<fmt:message key="label.timeslider" />
-				</a>
-				
 				<c:url  var="exportHtmlUrl" value="${etherpadServerUrl}/p/${groupSummary.padId}/export/html"/>
 				<a href="#nogo" onclick="window.location = '${exportHtmlUrl}';" class="btn btn-default btn-sm " 
 						title="<fmt:message key="label.export.pad.html" />">