Index: lams_admin/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r3943af271296c83fb9a2625d36299f2ae68f14cb -r99b0484e21db2f22ff09613d221f3364ed51e182
--- lams_admin/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 3943af271296c83fb9a2625d36299f2ae68f14cb)
+++ lams_admin/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
@@ -45,7 +45,6 @@
 		if (!showOnDemand) {
 			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
 		}
-		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
 			// It does not support shrinking, only growing.
@@ -56,7 +55,7 @@
 		        	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 + (${showControls} ? 0 : 30));
+		            	height = Math.max(200, msg.data.height + (${showControls} ? 10 : 29));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_build/conf/etherpad/etherpad-lite/node_modules/ep_resize/static/css/styles.css
===================================================================
diff -u
--- lams_build/conf/etherpad/etherpad-lite/node_modules/ep_resize/static/css/styles.css	(revision 0)
+++ lams_build/conf/etherpad/etherpad-lite/node_modules/ep_resize/static/css/styles.css	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
@@ -0,0 +1,4 @@
+#outerdocbody {
+	/* commented out by LAMS */
+   /* min-height: auto;  override - https://github.com/ether/etherpad-lite/blob/7d5cad693291db49c7e0eaf62117c660dccc0c6a/src/static/css/iframe_editor.css#L44 */
+}
Index: lams_central/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r3943af271296c83fb9a2625d36299f2ae68f14cb -r99b0484e21db2f22ff09613d221f3364ed51e182
--- lams_central/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 3943af271296c83fb9a2625d36299f2ae68f14cb)
+++ lams_central/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
@@ -45,7 +45,6 @@
 		if (!showOnDemand) {
 			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
 		}
-		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
 			// It does not support shrinking, only growing.
@@ -56,7 +55,7 @@
 		        	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 + (${showControls} ? 0 : 30));
+		            	height = Math.max(200, msg.data.height + (${showControls} ? 10 : 29));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_gradebook/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r3943af271296c83fb9a2625d36299f2ae68f14cb -r99b0484e21db2f22ff09613d221f3364ed51e182
--- lams_gradebook/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 3943af271296c83fb9a2625d36299f2ae68f14cb)
+++ lams_gradebook/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
@@ -45,7 +45,6 @@
 		if (!showOnDemand) {
 			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
 		}
-		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
 			// It does not support shrinking, only growing.
@@ -56,7 +55,7 @@
 		        	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 + (${showControls} ? 0 : 30));
+		            	height = Math.max(200, msg.data.height + (${showControls} ? 10 : 29));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_learning/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r3943af271296c83fb9a2625d36299f2ae68f14cb -r99b0484e21db2f22ff09613d221f3364ed51e182
--- lams_learning/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 3943af271296c83fb9a2625d36299f2ae68f14cb)
+++ lams_learning/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
@@ -45,7 +45,6 @@
 		if (!showOnDemand) {
 			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
 		}
-		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
 			// It does not support shrinking, only growing.
@@ -56,7 +55,7 @@
 		        	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 + (${showControls} ? 0 : 30));
+		            	height = Math.max(200, msg.data.height + (${showControls} ? 10 : 29));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_monitoring/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r3943af271296c83fb9a2625d36299f2ae68f14cb -r99b0484e21db2f22ff09613d221f3364ed51e182
--- lams_monitoring/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 3943af271296c83fb9a2625d36299f2ae68f14cb)
+++ lams_monitoring/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
@@ -45,7 +45,6 @@
 		if (!showOnDemand) {
 			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
 		}
-		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
 			// It does not support shrinking, only growing.
@@ -56,7 +55,7 @@
 		        	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 + (${showControls} ? 0 : 30));
+		            	height = Math.max(200, msg.data.height + (${showControls} ? 10 : 29));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_assessment/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r3943af271296c83fb9a2625d36299f2ae68f14cb -r99b0484e21db2f22ff09613d221f3364ed51e182
--- lams_tool_assessment/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 3943af271296c83fb9a2625d36299f2ae68f14cb)
+++ lams_tool_assessment/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
@@ -45,7 +45,6 @@
 		if (!showOnDemand) {
 			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
 		}
-		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
 			// It does not support shrinking, only growing.
@@ -56,7 +55,7 @@
 		        	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 + (${showControls} ? 0 : 30));
+		            	height = Math.max(200, msg.data.height + (${showControls} ? 10 : 29));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_chat/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r3943af271296c83fb9a2625d36299f2ae68f14cb -r99b0484e21db2f22ff09613d221f3364ed51e182
--- lams_tool_chat/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 3943af271296c83fb9a2625d36299f2ae68f14cb)
+++ lams_tool_chat/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
@@ -45,7 +45,6 @@
 		if (!showOnDemand) {
 			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
 		}
-		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
 			// It does not support shrinking, only growing.
@@ -56,7 +55,7 @@
 		        	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 + (${showControls} ? 0 : 30));
+		            	height = Math.max(200, msg.data.height + (${showControls} ? 10 : 29));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_daco/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r3943af271296c83fb9a2625d36299f2ae68f14cb -r99b0484e21db2f22ff09613d221f3364ed51e182
--- lams_tool_daco/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 3943af271296c83fb9a2625d36299f2ae68f14cb)
+++ lams_tool_daco/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
@@ -45,7 +45,6 @@
 		if (!showOnDemand) {
 			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
 		}
-		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
 			// It does not support shrinking, only growing.
@@ -56,7 +55,7 @@
 		        	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 + (${showControls} ? 0 : 30));
+		            	height = Math.max(200, msg.data.height + (${showControls} ? 10 : 29));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_doku/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r3943af271296c83fb9a2625d36299f2ae68f14cb -r99b0484e21db2f22ff09613d221f3364ed51e182
--- lams_tool_doku/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 3943af271296c83fb9a2625d36299f2ae68f14cb)
+++ lams_tool_doku/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
@@ -45,7 +45,6 @@
 		if (!showOnDemand) {
 			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
 		}
-		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
 			// It does not support shrinking, only growing.
@@ -56,7 +55,7 @@
 		        	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 + (${showControls} ? 0 : 30));
+		            	height = Math.max(200, msg.data.height + (${showControls} ? 10 : 29));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_doku/web/pages/learning/learning.jsp
===================================================================
diff -u -r3943af271296c83fb9a2625d36299f2ae68f14cb -r99b0484e21db2f22ff09613d221f3364ed51e182
--- lams_tool_doku/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 3943af271296c83fb9a2625d36299f2ae68f14cb)
+++ lams_tool_doku/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
@@ -42,7 +42,6 @@
 	<lams:JSImport src="learning/includes/javascript/gate-check.js" />
 	<script type="text/javascript">
 		checkNextGateActivity('finish-button', '${toolSessionID}', '', finishSession);
-	    
 		$(document).ready(function(){
 			// Resize Etherpad iframe when its content grows.
 			// It does not support shrinking, only growing.
@@ -53,7 +52,7 @@
 		        	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 and not timeLimitExceeded} ? 0 : 30));
+		            	height = Math.max(200, msg.data.height + (${hasEditRight and not timeLimitExceeded} ? 10 : 29));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_forum/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r3943af271296c83fb9a2625d36299f2ae68f14cb -r99b0484e21db2f22ff09613d221f3364ed51e182
--- lams_tool_forum/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 3943af271296c83fb9a2625d36299f2ae68f14cb)
+++ lams_tool_forum/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
@@ -45,7 +45,6 @@
 		if (!showOnDemand) {
 			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
 		}
-		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
 			// It does not support shrinking, only growing.
@@ -56,7 +55,7 @@
 		        	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 + (${showControls} ? 0 : 30));
+		            	height = Math.max(200, msg.data.height + (${showControls} ? 10 : 29));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_gmap/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r3943af271296c83fb9a2625d36299f2ae68f14cb -r99b0484e21db2f22ff09613d221f3364ed51e182
--- lams_tool_gmap/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 3943af271296c83fb9a2625d36299f2ae68f14cb)
+++ lams_tool_gmap/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
@@ -45,7 +45,6 @@
 		if (!showOnDemand) {
 			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
 		}
-		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
 			// It does not support shrinking, only growing.
@@ -56,7 +55,7 @@
 		        	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 + (${showControls} ? 0 : 30));
+		            	height = Math.max(200, msg.data.height + (${showControls} ? 10 : 29));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_images/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r3943af271296c83fb9a2625d36299f2ae68f14cb -r99b0484e21db2f22ff09613d221f3364ed51e182
--- lams_tool_images/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 3943af271296c83fb9a2625d36299f2ae68f14cb)
+++ lams_tool_images/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
@@ -45,7 +45,6 @@
 		if (!showOnDemand) {
 			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
 		}
-		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
 			// It does not support shrinking, only growing.
@@ -56,7 +55,7 @@
 		        	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 + (${showControls} ? 0 : 30));
+		            	height = Math.max(200, msg.data.height + (${showControls} ? 10 : 29));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_imscc/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r3943af271296c83fb9a2625d36299f2ae68f14cb -r99b0484e21db2f22ff09613d221f3364ed51e182
--- lams_tool_imscc/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 3943af271296c83fb9a2625d36299f2ae68f14cb)
+++ lams_tool_imscc/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
@@ -45,7 +45,6 @@
 		if (!showOnDemand) {
 			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
 		}
-		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
 			// It does not support shrinking, only growing.
@@ -56,7 +55,7 @@
 		        	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 + (${showControls} ? 0 : 30));
+		            	height = Math.max(200, msg.data.height + (${showControls} ? 10 : 29));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_lamc/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r3943af271296c83fb9a2625d36299f2ae68f14cb -r99b0484e21db2f22ff09613d221f3364ed51e182
--- lams_tool_lamc/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 3943af271296c83fb9a2625d36299f2ae68f14cb)
+++ lams_tool_lamc/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
@@ -45,7 +45,6 @@
 		if (!showOnDemand) {
 			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
 		}
-		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
 			// It does not support shrinking, only growing.
@@ -56,7 +55,7 @@
 		        	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 + (${showControls} ? 0 : 30));
+		            	height = Math.max(200, msg.data.height + (${showControls} ? 10 : 29));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_laqa/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r3943af271296c83fb9a2625d36299f2ae68f14cb -r99b0484e21db2f22ff09613d221f3364ed51e182
--- lams_tool_laqa/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 3943af271296c83fb9a2625d36299f2ae68f14cb)
+++ lams_tool_laqa/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
@@ -45,7 +45,6 @@
 		if (!showOnDemand) {
 			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
 		}
-		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
 			// It does not support shrinking, only growing.
@@ -56,7 +55,7 @@
 		        	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 + (${showControls} ? 0 : 30));
+		            	height = Math.max(200, msg.data.height + (${showControls} ? 10 : 29));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_larsrc/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r3943af271296c83fb9a2625d36299f2ae68f14cb -r99b0484e21db2f22ff09613d221f3364ed51e182
--- lams_tool_larsrc/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 3943af271296c83fb9a2625d36299f2ae68f14cb)
+++ lams_tool_larsrc/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
@@ -45,7 +45,6 @@
 		if (!showOnDemand) {
 			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
 		}
-		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
 			// It does not support shrinking, only growing.
@@ -56,7 +55,7 @@
 		        	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 + (${showControls} ? 0 : 30));
+		            	height = Math.max(200, msg.data.height + (${showControls} ? 10 : 29));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_leader/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r3943af271296c83fb9a2625d36299f2ae68f14cb -r99b0484e21db2f22ff09613d221f3364ed51e182
--- lams_tool_leader/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 3943af271296c83fb9a2625d36299f2ae68f14cb)
+++ lams_tool_leader/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
@@ -45,7 +45,6 @@
 		if (!showOnDemand) {
 			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
 		}
-		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
 			// It does not support shrinking, only growing.
@@ -56,7 +55,7 @@
 		        	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 + (${showControls} ? 0 : 30));
+		            	height = Math.max(200, msg.data.height + (${showControls} ? 10 : 29));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_mindmap/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r3943af271296c83fb9a2625d36299f2ae68f14cb -r99b0484e21db2f22ff09613d221f3364ed51e182
--- lams_tool_mindmap/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 3943af271296c83fb9a2625d36299f2ae68f14cb)
+++ lams_tool_mindmap/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
@@ -45,7 +45,6 @@
 		if (!showOnDemand) {
 			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
 		}
-		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
 			// It does not support shrinking, only growing.
@@ -56,7 +55,7 @@
 		        	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 + (${showControls} ? 0 : 30));
+		            	height = Math.max(200, msg.data.height + (${showControls} ? 10 : 29));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_nb/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r3943af271296c83fb9a2625d36299f2ae68f14cb -r99b0484e21db2f22ff09613d221f3364ed51e182
--- lams_tool_nb/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 3943af271296c83fb9a2625d36299f2ae68f14cb)
+++ lams_tool_nb/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
@@ -45,7 +45,6 @@
 		if (!showOnDemand) {
 			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
 		}
-		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
 			// It does not support shrinking, only growing.
@@ -56,7 +55,7 @@
 		        	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 + (${showControls} ? 0 : 30));
+		            	height = Math.max(200, msg.data.height + (${showControls} ? 10 : 29));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_notebook/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r3943af271296c83fb9a2625d36299f2ae68f14cb -r99b0484e21db2f22ff09613d221f3364ed51e182
--- lams_tool_notebook/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 3943af271296c83fb9a2625d36299f2ae68f14cb)
+++ lams_tool_notebook/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
@@ -45,7 +45,6 @@
 		if (!showOnDemand) {
 			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
 		}
-		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
 			// It does not support shrinking, only growing.
@@ -56,7 +55,7 @@
 		        	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 + (${showControls} ? 0 : 30));
+		            	height = Math.max(200, msg.data.height + (${showControls} ? 10 : 29));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_pixlr/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r3943af271296c83fb9a2625d36299f2ae68f14cb -r99b0484e21db2f22ff09613d221f3364ed51e182
--- lams_tool_pixlr/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 3943af271296c83fb9a2625d36299f2ae68f14cb)
+++ lams_tool_pixlr/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
@@ -45,7 +45,6 @@
 		if (!showOnDemand) {
 			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
 		}
-		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
 			// It does not support shrinking, only growing.
@@ -56,7 +55,7 @@
 		        	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 + (${showControls} ? 0 : 30));
+		            	height = Math.max(200, msg.data.height + (${showControls} ? 10 : 29));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_preview/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r3943af271296c83fb9a2625d36299f2ae68f14cb -r99b0484e21db2f22ff09613d221f3364ed51e182
--- lams_tool_preview/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 3943af271296c83fb9a2625d36299f2ae68f14cb)
+++ lams_tool_preview/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
@@ -45,7 +45,6 @@
 		if (!showOnDemand) {
 			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
 		}
-		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
 			// It does not support shrinking, only growing.
@@ -56,7 +55,7 @@
 		        	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 + (${showControls} ? 0 : 30));
+		            	height = Math.max(200, msg.data.height + (${showControls} ? 10 : 29));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_sbmt/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r3943af271296c83fb9a2625d36299f2ae68f14cb -r99b0484e21db2f22ff09613d221f3364ed51e182
--- lams_tool_sbmt/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 3943af271296c83fb9a2625d36299f2ae68f14cb)
+++ lams_tool_sbmt/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
@@ -45,7 +45,6 @@
 		if (!showOnDemand) {
 			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
 		}
-		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
 			// It does not support shrinking, only growing.
@@ -56,7 +55,7 @@
 		        	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 + (${showControls} ? 0 : 30));
+		            	height = Math.max(200, msg.data.height + (${showControls} ? 10 : 29));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_scratchie/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r3943af271296c83fb9a2625d36299f2ae68f14cb -r99b0484e21db2f22ff09613d221f3364ed51e182
--- lams_tool_scratchie/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 3943af271296c83fb9a2625d36299f2ae68f14cb)
+++ lams_tool_scratchie/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
@@ -45,7 +45,6 @@
 		if (!showOnDemand) {
 			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
 		}
-		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
 			// It does not support shrinking, only growing.
@@ -56,7 +55,7 @@
 		        	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 + (${showControls} ? 0 : 30));
+		            	height = Math.max(200, msg.data.height + (${showControls} ? 10 : 29));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_scribe/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r3943af271296c83fb9a2625d36299f2ae68f14cb -r99b0484e21db2f22ff09613d221f3364ed51e182
--- lams_tool_scribe/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 3943af271296c83fb9a2625d36299f2ae68f14cb)
+++ lams_tool_scribe/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
@@ -45,7 +45,6 @@
 		if (!showOnDemand) {
 			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
 		}
-		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
 			// It does not support shrinking, only growing.
@@ -56,7 +55,7 @@
 		        	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 + (${showControls} ? 0 : 30));
+		            	height = Math.max(200, msg.data.height + (${showControls} ? 10 : 29));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_spreadsheet/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r3943af271296c83fb9a2625d36299f2ae68f14cb -r99b0484e21db2f22ff09613d221f3364ed51e182
--- lams_tool_spreadsheet/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 3943af271296c83fb9a2625d36299f2ae68f14cb)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
@@ -45,7 +45,6 @@
 		if (!showOnDemand) {
 			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
 		}
-		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
 			// It does not support shrinking, only growing.
@@ -56,7 +55,7 @@
 		        	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 + (${showControls} ? 0 : 30));
+		            	height = Math.max(200, msg.data.height + (${showControls} ? 10 : 29));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_survey/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r3943af271296c83fb9a2625d36299f2ae68f14cb -r99b0484e21db2f22ff09613d221f3364ed51e182
--- lams_tool_survey/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 3943af271296c83fb9a2625d36299f2ae68f14cb)
+++ lams_tool_survey/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
@@ -45,7 +45,6 @@
 		if (!showOnDemand) {
 			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
 		}
-		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
 			// It does not support shrinking, only growing.
@@ -56,7 +55,7 @@
 		        	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 + (${showControls} ? 0 : 30));
+		            	height = Math.max(200, msg.data.height + (${showControls} ? 10 : 29));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_task/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r3943af271296c83fb9a2625d36299f2ae68f14cb -r99b0484e21db2f22ff09613d221f3364ed51e182
--- lams_tool_task/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 3943af271296c83fb9a2625d36299f2ae68f14cb)
+++ lams_tool_task/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
@@ -45,7 +45,6 @@
 		if (!showOnDemand) {
 			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
 		}
-		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
 			// It does not support shrinking, only growing.
@@ -56,7 +55,7 @@
 		        	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 + (${showControls} ? 0 : 30));
+		            	height = Math.max(200, msg.data.height + (${showControls} ? 10 : 29));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_vote/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r3943af271296c83fb9a2625d36299f2ae68f14cb -r99b0484e21db2f22ff09613d221f3364ed51e182
--- lams_tool_vote/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 3943af271296c83fb9a2625d36299f2ae68f14cb)
+++ lams_tool_vote/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
@@ -45,7 +45,6 @@
 		if (!showOnDemand) {
 			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
 		}
-		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
 			// It does not support shrinking, only growing.
@@ -56,7 +55,7 @@
 		        	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 + (${showControls} ? 0 : 30));
+		            	height = Math.max(200, msg.data.height + (${showControls} ? 10 : 29));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_whiteboard/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r3943af271296c83fb9a2625d36299f2ae68f14cb -r99b0484e21db2f22ff09613d221f3364ed51e182
--- lams_tool_whiteboard/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 3943af271296c83fb9a2625d36299f2ae68f14cb)
+++ lams_tool_whiteboard/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
@@ -45,7 +45,6 @@
 		if (!showOnDemand) {
 			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
 		}
-		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
 			// It does not support shrinking, only growing.
@@ -56,7 +55,7 @@
 		        	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 + (${showControls} ? 0 : 30));
+		            	height = Math.max(200, msg.data.height + (${showControls} ? 10 : 29));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_wiki/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r3943af271296c83fb9a2625d36299f2ae68f14cb -r99b0484e21db2f22ff09613d221f3364ed51e182
--- lams_tool_wiki/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 3943af271296c83fb9a2625d36299f2ae68f14cb)
+++ lams_tool_wiki/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
@@ -45,7 +45,6 @@
 		if (!showOnDemand) {
 			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
 		}
-		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
 			// It does not support shrinking, only growing.
@@ -56,7 +55,7 @@
 		        	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 + (${showControls} ? 0 : 30));
+		            	height = Math.max(200, msg.data.height + (${showControls} ? 10 : 29));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_zoom/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r3943af271296c83fb9a2625d36299f2ae68f14cb -r99b0484e21db2f22ff09613d221f3364ed51e182
--- lams_tool_zoom/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 3943af271296c83fb9a2625d36299f2ae68f14cb)
+++ lams_tool_zoom/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
@@ -45,7 +45,6 @@
 		if (!showOnDemand) {
 			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
 		}
-		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
 			// It does not support shrinking, only growing.
@@ -56,7 +55,7 @@
 		        	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 + (${showControls} ? 0 : 30));
+		            	height = Math.max(200, msg.data.height + (${showControls} ? 10 : 29));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_www/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r3943af271296c83fb9a2625d36299f2ae68f14cb -r99b0484e21db2f22ff09613d221f3364ed51e182
--- lams_www/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 3943af271296c83fb9a2625d36299f2ae68f14cb)
+++ lams_www/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
@@ -45,7 +45,6 @@
 		if (!showOnDemand) {
 			lamsEtherpadTagInitialiseDelay = delayBeforeInitialise + 1500;
 		}
-		
 		<c:if test="${heightAutoGrow eq 'true'}">
 			// Resize Etherpad iframe when its content grows.
 			// It does not support shrinking, only growing.
@@ -56,7 +55,7 @@
 		        	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 + (${showControls} ? 0 : 30));
+		            	height = Math.max(200, msg.data.height + (${showControls} ? 10 : 29));
 		           	iframe.height(height);
 		        }
 		    });