Index: lams_admin/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r793fc867decb0837cf563bfeb0e284103750a6e3 -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d
--- lams_admin/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 793fc867decb0837cf563bfeb0e284103750a6e3)
+++ lams_admin/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
@@ -49,7 +49,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 : 72});
+		            	height = Math.max(200, msg.data.height - 10);
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_build/conf/etherpad/etherpad-lite/node_modules/ep_resize/static/js/index.js
===================================================================
diff -u -re43f0bd30b5df2f0c65f7cb75474c76ef253b39a -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d
--- lams_build/conf/etherpad/etherpad-lite/node_modules/ep_resize/static/js/index.js	(.../index.js)	(revision e43f0bd30b5df2f0c65f7cb75474c76ef253b39a)
+++ lams_build/conf/etherpad/etherpad-lite/node_modules/ep_resize/static/js/index.js	(.../index.js)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
@@ -2,47 +2,54 @@
 
 var lastHeight;
 var lastWidth;
-var returnchildHeights = function (children) {
+var returnchildHeights = function (children, offsetTop) {
+    offsetTop = offsetTop + 10 || 10; //Some extra padding for possible shadows etc.
+
     var maxHeight = 0;
     if (children.length) {
         maxHeight = 0;
         children.each(function (key, child) {
-            if ($(child).is(':visible')) {
-                var childtop = ($(child).offset().top + $(child).outerHeight());
+            if ($(child).is(':visible') && $(child).attr('id') !== 'editorcontainerbox' && $(child).attr('id') !== 'editbar' && !$(child).is('iframe') && $(child)[0].offsetHeight > 0) { // Avoid infinit increasing
+                var childtop = ($(child).offset().top + $(child)[0].offsetHeight) + offsetTop;
                 if (childtop > maxHeight) {
                     maxHeight = childtop;
                 }
-            }        
+            }
         });
     }
 
     return maxHeight;
 };
 
-exports.aceEditEvent = function (event, args, callback) {
-    var editbar = $('#editbar');
-    
+exports.aceEditEvent = function (event, context, callback) {
+    var ace_outer_top = $('iframe[name=ace_outer]').offset().top;
+    var ace_inner_top = $('iframe[name=ace_outer]').contents().find('iframe[name=ace_inner]').offset().top;
+    var getFinalLine = context.rep.lines.atIndex(context.rep.lines.length()-1);
+    var finalLine =  $(getFinalLine.lineNode);
+
     var elem = $('iframe[name=ace_outer]').contents().find('iframe[name=ace_inner]');
-    var newHeight = elem.outerHeight() + (editbar.length ? editbar.outerHeight() : 0);
+    var newHeight = finalLine.offset().top + finalLine.outerHeight() + ace_outer_top + ace_inner_top;
     var newWidth = elem.outerWidth();
 
-    var maxChild = returnchildHeights($('iframe[name=ace_outer]').contents().find('body').children());
+    var maxChild = returnchildHeights($('iframe[name=ace_outer]').contents().find('body').children(), ace_outer_top);
     var maxChildBody = returnchildHeights($('body').children());
+
     if (maxChildBody > maxChild) {
         maxChild = maxChildBody
     }
 
     if (maxChild > newHeight) {
         newHeight = maxChild;
     }
+
     if (!lastHeight || !lastWidth || lastHeight !== newHeight || lastWidth !== newWidth) {
         sendResizeMessage(newWidth, newHeight, window.document.location.href);
     }
     
 };
 
 exports.goToRevisionEvent = function (hook_name, context, cb) {
-    
+
     var editbar = $('#timeslider-top')
     var elem = $('#padeditor');
 
@@ -57,8 +64,8 @@
 var sendResizeMessage = function (width, height, location) {
     lastHeight = height;
     lastWidth = width;
-    
 
+
     window.parent.postMessage({
         name: 'ep_resize',
         data: {
@@ -67,4 +74,4 @@
             location : location
         }
     }, '*');
-} 
+}
Index: lams_central/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r793fc867decb0837cf563bfeb0e284103750a6e3 -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d
--- lams_central/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 793fc867decb0837cf563bfeb0e284103750a6e3)
+++ lams_central/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
@@ -49,7 +49,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 : 72});
+		            	height = Math.max(200, msg.data.height - 10);
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_gradebook/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r793fc867decb0837cf563bfeb0e284103750a6e3 -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d
--- lams_gradebook/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 793fc867decb0837cf563bfeb0e284103750a6e3)
+++ lams_gradebook/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
@@ -49,7 +49,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 : 72});
+		            	height = Math.max(200, msg.data.height - 10);
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_learning/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r793fc867decb0837cf563bfeb0e284103750a6e3 -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d
--- lams_learning/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 793fc867decb0837cf563bfeb0e284103750a6e3)
+++ lams_learning/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
@@ -49,7 +49,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 : 72});
+		            	height = Math.max(200, msg.data.height - 10);
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_monitoring/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r793fc867decb0837cf563bfeb0e284103750a6e3 -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d
--- lams_monitoring/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 793fc867decb0837cf563bfeb0e284103750a6e3)
+++ lams_monitoring/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
@@ -49,7 +49,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 : 72});
+		            	height = Math.max(200, msg.data.height - 10);
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_assessment/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r793fc867decb0837cf563bfeb0e284103750a6e3 -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d
--- lams_tool_assessment/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 793fc867decb0837cf563bfeb0e284103750a6e3)
+++ lams_tool_assessment/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
@@ -49,7 +49,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 : 72});
+		            	height = Math.max(200, msg.data.height - 10);
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_chat/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r793fc867decb0837cf563bfeb0e284103750a6e3 -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d
--- lams_tool_chat/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 793fc867decb0837cf563bfeb0e284103750a6e3)
+++ lams_tool_chat/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
@@ -49,7 +49,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 : 72});
+		            	height = Math.max(200, msg.data.height - 10);
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_daco/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r793fc867decb0837cf563bfeb0e284103750a6e3 -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d
--- lams_tool_daco/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 793fc867decb0837cf563bfeb0e284103750a6e3)
+++ lams_tool_daco/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
@@ -49,7 +49,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 : 72});
+		            	height = Math.max(200, msg.data.height - 10);
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_doku/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r793fc867decb0837cf563bfeb0e284103750a6e3 -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d
--- lams_tool_doku/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 793fc867decb0837cf563bfeb0e284103750a6e3)
+++ lams_tool_doku/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
@@ -49,7 +49,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 : 72});
+		            	height = Math.max(200, msg.data.height - 10);
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_forum/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r793fc867decb0837cf563bfeb0e284103750a6e3 -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d
--- lams_tool_forum/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 793fc867decb0837cf563bfeb0e284103750a6e3)
+++ lams_tool_forum/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
@@ -49,7 +49,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 : 72});
+		            	height = Math.max(200, msg.data.height - 10);
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_gmap/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r793fc867decb0837cf563bfeb0e284103750a6e3 -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d
--- lams_tool_gmap/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 793fc867decb0837cf563bfeb0e284103750a6e3)
+++ lams_tool_gmap/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
@@ -49,7 +49,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 : 72});
+		            	height = Math.max(200, msg.data.height - 10);
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_images/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r793fc867decb0837cf563bfeb0e284103750a6e3 -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d
--- lams_tool_images/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 793fc867decb0837cf563bfeb0e284103750a6e3)
+++ lams_tool_images/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
@@ -49,7 +49,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 : 72});
+		            	height = Math.max(200, msg.data.height - 10);
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_imscc/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r793fc867decb0837cf563bfeb0e284103750a6e3 -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d
--- lams_tool_imscc/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 793fc867decb0837cf563bfeb0e284103750a6e3)
+++ lams_tool_imscc/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
@@ -49,7 +49,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 : 72});
+		            	height = Math.max(200, msg.data.height - 10);
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_lamc/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r793fc867decb0837cf563bfeb0e284103750a6e3 -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d
--- lams_tool_lamc/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 793fc867decb0837cf563bfeb0e284103750a6e3)
+++ lams_tool_lamc/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
@@ -49,7 +49,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 : 72});
+		            	height = Math.max(200, msg.data.height - 10);
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_laqa/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r793fc867decb0837cf563bfeb0e284103750a6e3 -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d
--- lams_tool_laqa/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 793fc867decb0837cf563bfeb0e284103750a6e3)
+++ lams_tool_laqa/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
@@ -49,7 +49,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 : 72});
+		            	height = Math.max(200, msg.data.height - 10);
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_larsrc/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r793fc867decb0837cf563bfeb0e284103750a6e3 -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d
--- lams_tool_larsrc/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 793fc867decb0837cf563bfeb0e284103750a6e3)
+++ lams_tool_larsrc/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
@@ -49,7 +49,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 : 72});
+		            	height = Math.max(200, msg.data.height - 10);
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_leader/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r793fc867decb0837cf563bfeb0e284103750a6e3 -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d
--- lams_tool_leader/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 793fc867decb0837cf563bfeb0e284103750a6e3)
+++ lams_tool_leader/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
@@ -49,7 +49,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 : 72});
+		            	height = Math.max(200, msg.data.height - 10);
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_mindmap/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r793fc867decb0837cf563bfeb0e284103750a6e3 -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d
--- lams_tool_mindmap/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 793fc867decb0837cf563bfeb0e284103750a6e3)
+++ lams_tool_mindmap/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
@@ -49,7 +49,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 : 72});
+		            	height = Math.max(200, msg.data.height - 10);
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_nb/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r793fc867decb0837cf563bfeb0e284103750a6e3 -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d
--- lams_tool_nb/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 793fc867decb0837cf563bfeb0e284103750a6e3)
+++ lams_tool_nb/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
@@ -49,7 +49,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 : 72});
+		            	height = Math.max(200, msg.data.height - 10);
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_notebook/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r793fc867decb0837cf563bfeb0e284103750a6e3 -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d
--- lams_tool_notebook/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 793fc867decb0837cf563bfeb0e284103750a6e3)
+++ lams_tool_notebook/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
@@ -49,7 +49,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 : 72});
+		            	height = Math.max(200, msg.data.height - 10);
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_pixlr/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r793fc867decb0837cf563bfeb0e284103750a6e3 -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d
--- lams_tool_pixlr/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 793fc867decb0837cf563bfeb0e284103750a6e3)
+++ lams_tool_pixlr/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
@@ -49,7 +49,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 : 72});
+		            	height = Math.max(200, msg.data.height - 10);
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_preview/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r793fc867decb0837cf563bfeb0e284103750a6e3 -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d
--- lams_tool_preview/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 793fc867decb0837cf563bfeb0e284103750a6e3)
+++ lams_tool_preview/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
@@ -49,7 +49,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 : 72});
+		            	height = Math.max(200, msg.data.height - 10);
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_sbmt/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r793fc867decb0837cf563bfeb0e284103750a6e3 -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d
--- lams_tool_sbmt/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 793fc867decb0837cf563bfeb0e284103750a6e3)
+++ lams_tool_sbmt/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
@@ -49,7 +49,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 : 72});
+		            	height = Math.max(200, msg.data.height - 10);
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_scratchie/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r793fc867decb0837cf563bfeb0e284103750a6e3 -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d
--- lams_tool_scratchie/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 793fc867decb0837cf563bfeb0e284103750a6e3)
+++ lams_tool_scratchie/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
@@ -49,7 +49,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 : 72});
+		            	height = Math.max(200, msg.data.height - 10);
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_scribe/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r793fc867decb0837cf563bfeb0e284103750a6e3 -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d
--- lams_tool_scribe/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 793fc867decb0837cf563bfeb0e284103750a6e3)
+++ lams_tool_scribe/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
@@ -49,7 +49,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 : 72});
+		            	height = Math.max(200, msg.data.height - 10);
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_spreadsheet/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r793fc867decb0837cf563bfeb0e284103750a6e3 -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d
--- lams_tool_spreadsheet/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 793fc867decb0837cf563bfeb0e284103750a6e3)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
@@ -49,7 +49,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 : 72});
+		            	height = Math.max(200, msg.data.height - 10);
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_survey/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r793fc867decb0837cf563bfeb0e284103750a6e3 -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d
--- lams_tool_survey/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 793fc867decb0837cf563bfeb0e284103750a6e3)
+++ lams_tool_survey/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
@@ -49,7 +49,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 : 72});
+		            	height = Math.max(200, msg.data.height - 10);
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_task/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r793fc867decb0837cf563bfeb0e284103750a6e3 -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d
--- lams_tool_task/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 793fc867decb0837cf563bfeb0e284103750a6e3)
+++ lams_tool_task/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
@@ -49,7 +49,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 : 72});
+		            	height = Math.max(200, msg.data.height - 10);
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_vote/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r793fc867decb0837cf563bfeb0e284103750a6e3 -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d
--- lams_tool_vote/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 793fc867decb0837cf563bfeb0e284103750a6e3)
+++ lams_tool_vote/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
@@ -49,7 +49,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 : 72});
+		            	height = Math.max(200, msg.data.height - 10);
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_wiki/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r793fc867decb0837cf563bfeb0e284103750a6e3 -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d
--- lams_tool_wiki/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 793fc867decb0837cf563bfeb0e284103750a6e3)
+++ lams_tool_wiki/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
@@ -49,7 +49,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 : 72});
+		            	height = Math.max(200, msg.data.height - 10);
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_zoom/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r793fc867decb0837cf563bfeb0e284103750a6e3 -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d
--- lams_tool_zoom/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 793fc867decb0837cf563bfeb0e284103750a6e3)
+++ lams_tool_zoom/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
@@ -49,7 +49,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 : 72});
+		            	height = Math.max(200, msg.data.height - 10);
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_www/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r793fc867decb0837cf563bfeb0e284103750a6e3 -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d
--- lams_www/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 793fc867decb0837cf563bfeb0e284103750a6e3)
+++ lams_www/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
@@ -49,7 +49,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 : 72});
+		            	height = Math.max(200, msg.data.height - 10);
 		           	iframe.height(height);
 		        }
 		    });