Index: lams_admin/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u
--- lams_admin/web/WEB-INF/tags/Etherpad.tag	(revision 0)
+++ lams_admin/web/WEB-INF/tags/Etherpad.tag	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -0,0 +1,98 @@
+<% 
+ /**
+  * Etherpad.tag
+  *	Author: Marcin Cieslak
+  *	Description: Etherpad pad
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+
+<%@ attribute name="groupId" required="true" rtexprvalue="true" %>
+<%@ attribute name="showControls" required="false" rtexprvalue="true" %>
+<%@ attribute name="showChat" required="false" rtexprvalue="true" %>
+<%@ attribute name="height" required="false" rtexprvalue="true" %>
+<%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
+<c:set var="etherpadServerUrl"><%=Configuration.get(ConfigurationKeys.ETHERPAD_SERVER_URL)%></c:set>
+<c:set var="localeLanguage"><lams:user property="localeLanguage" /></c:set>
+<jsp:doBody var="content" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.etherpad-initial-content {
+		display: none;
+	}
+</style>
+
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
+<script type="text/javascript">
+	$(document).ready(function(){
+		// 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;
+		
+		<c:if test="${heightAutoGrow eq 'true'}">
+			// 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:if>
+		
+		window.setTimeout(function(){
+			$.ajax({
+				url: '<lams:LAMSURL/>etherpad/getPad.do',
+				cache : false,
+				type: "GET",
+				data: {
+					groupId : '${groupId}',
+					content : $('#etherpad-initial-content-${groupId}').html()
+				},
+				dataType : 'text',
+				success: function(padId, status, xhr) {
+					lamsEtherpadTagInitialising = false;
+					if ( status == "error" ) {
+						console.log( xhr.status + " " + xhr.statusText );
+					} else {
+						// proper initialisation
+						$('#etherpad-container-${groupId}').pad({
+							'padId': padId,
+							'host':'${etherpadServerUrl}',
+							'lang':'${fn:toLowerCase(localeLanguage)}',
+							'showControls':${empty showControls ? false : showControls},
+							'showChat': ${empty showChat ? false : showChat},
+							'height': ${empty height ? 'undefined' : height}
+							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+						});
+					}
+				}
+			});
+			// wait for other pad on the page to initialise
+		}, delayBeforeInitialise);
+	});
+</script>
+
+<div class="etherpad-container" id='etherpad-container-${groupId}'></div>
+
+<%-- If content was provided, put it into a hidden div so new lines will not break JavaScript --%>
+<c:if test="${not empty content.trim()}">
+	<span class="etherpad-initial-content" id="etherpad-initial-content-${groupId}">
+		${content}
+	</span>
+</c:if>
\ No newline at end of file
Index: lams_admin/web/WEB-INF/tags/ImgButtonWrapper.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_admin/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_admin/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -1,37 +1,37 @@
-<% 
-/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
- 
- /**
-  * ImgButtonWrapper.tag
-  *	Author: Mitchell Seaton
-  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
-  */
- 
- %>
-<%@ tag body-content="scriptless" %>
-<div id="button-table" class="space-bottom-top">
-	<div id="button-row">
-		<jsp:doBody />
-	</div>
-</div>
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * ImgButtonWrapper.tag
+  *	Author: Mitchell Seaton
+  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
+  */
+ 
+ %>
+<%@ tag body-content="scriptless" %>
+<div id="button-table" class="space-bottom-top">
+	<div id="button-row">
+		<jsp:doBody />
+	</div>
+</div>
Index: lams_admin/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r24ebb6c91f49a10f1e5718036b3a3c1a80c3314f -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_admin/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 24ebb6c91f49a10f1e5718036b3a3c1a80c3314f)
+++ lams_admin/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -344,6 +344,10 @@
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
 	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
Index: lams_central/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u
--- lams_central/web/WEB-INF/tags/Etherpad.tag	(revision 0)
+++ lams_central/web/WEB-INF/tags/Etherpad.tag	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -0,0 +1,98 @@
+<% 
+ /**
+  * Etherpad.tag
+  *	Author: Marcin Cieslak
+  *	Description: Etherpad pad
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+
+<%@ attribute name="groupId" required="true" rtexprvalue="true" %>
+<%@ attribute name="showControls" required="false" rtexprvalue="true" %>
+<%@ attribute name="showChat" required="false" rtexprvalue="true" %>
+<%@ attribute name="height" required="false" rtexprvalue="true" %>
+<%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
+<c:set var="etherpadServerUrl"><%=Configuration.get(ConfigurationKeys.ETHERPAD_SERVER_URL)%></c:set>
+<c:set var="localeLanguage"><lams:user property="localeLanguage" /></c:set>
+<jsp:doBody var="content" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.etherpad-initial-content {
+		display: none;
+	}
+</style>
+
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
+<script type="text/javascript">
+	$(document).ready(function(){
+		// 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;
+		
+		<c:if test="${heightAutoGrow eq 'true'}">
+			// 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:if>
+		
+		window.setTimeout(function(){
+			$.ajax({
+				url: '<lams:LAMSURL/>etherpad/getPad.do',
+				cache : false,
+				type: "GET",
+				data: {
+					groupId : '${groupId}',
+					content : $('#etherpad-initial-content-${groupId}').html()
+				},
+				dataType : 'text',
+				success: function(padId, status, xhr) {
+					lamsEtherpadTagInitialising = false;
+					if ( status == "error" ) {
+						console.log( xhr.status + " " + xhr.statusText );
+					} else {
+						// proper initialisation
+						$('#etherpad-container-${groupId}').pad({
+							'padId': padId,
+							'host':'${etherpadServerUrl}',
+							'lang':'${fn:toLowerCase(localeLanguage)}',
+							'showControls':${empty showControls ? false : showControls},
+							'showChat': ${empty showChat ? false : showChat},
+							'height': ${empty height ? 'undefined' : height}
+							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+						});
+					}
+				}
+			});
+			// wait for other pad on the page to initialise
+		}, delayBeforeInitialise);
+	});
+</script>
+
+<div class="etherpad-container" id='etherpad-container-${groupId}'></div>
+
+<%-- If content was provided, put it into a hidden div so new lines will not break JavaScript --%>
+<c:if test="${not empty content.trim()}">
+	<span class="etherpad-initial-content" id="etherpad-initial-content-${groupId}">
+		${content}
+	</span>
+</c:if>
\ No newline at end of file
Index: lams_central/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rae9912edeb82523d71d1e18df67ec5ee7e6301a8 -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_central/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision ae9912edeb82523d71d1e18df67ec5ee7e6301a8)
+++ lams_central/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -344,6 +344,10 @@
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
 	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
Index: lams_gradebook/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u
--- lams_gradebook/web/WEB-INF/tags/Etherpad.tag	(revision 0)
+++ lams_gradebook/web/WEB-INF/tags/Etherpad.tag	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -0,0 +1,98 @@
+<% 
+ /**
+  * Etherpad.tag
+  *	Author: Marcin Cieslak
+  *	Description: Etherpad pad
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+
+<%@ attribute name="groupId" required="true" rtexprvalue="true" %>
+<%@ attribute name="showControls" required="false" rtexprvalue="true" %>
+<%@ attribute name="showChat" required="false" rtexprvalue="true" %>
+<%@ attribute name="height" required="false" rtexprvalue="true" %>
+<%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
+<c:set var="etherpadServerUrl"><%=Configuration.get(ConfigurationKeys.ETHERPAD_SERVER_URL)%></c:set>
+<c:set var="localeLanguage"><lams:user property="localeLanguage" /></c:set>
+<jsp:doBody var="content" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.etherpad-initial-content {
+		display: none;
+	}
+</style>
+
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
+<script type="text/javascript">
+	$(document).ready(function(){
+		// 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;
+		
+		<c:if test="${heightAutoGrow eq 'true'}">
+			// 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:if>
+		
+		window.setTimeout(function(){
+			$.ajax({
+				url: '<lams:LAMSURL/>etherpad/getPad.do',
+				cache : false,
+				type: "GET",
+				data: {
+					groupId : '${groupId}',
+					content : $('#etherpad-initial-content-${groupId}').html()
+				},
+				dataType : 'text',
+				success: function(padId, status, xhr) {
+					lamsEtherpadTagInitialising = false;
+					if ( status == "error" ) {
+						console.log( xhr.status + " " + xhr.statusText );
+					} else {
+						// proper initialisation
+						$('#etherpad-container-${groupId}').pad({
+							'padId': padId,
+							'host':'${etherpadServerUrl}',
+							'lang':'${fn:toLowerCase(localeLanguage)}',
+							'showControls':${empty showControls ? false : showControls},
+							'showChat': ${empty showChat ? false : showChat},
+							'height': ${empty height ? 'undefined' : height}
+							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+						});
+					}
+				}
+			});
+			// wait for other pad on the page to initialise
+		}, delayBeforeInitialise);
+	});
+</script>
+
+<div class="etherpad-container" id='etherpad-container-${groupId}'></div>
+
+<%-- If content was provided, put it into a hidden div so new lines will not break JavaScript --%>
+<c:if test="${not empty content.trim()}">
+	<span class="etherpad-initial-content" id="etherpad-initial-content-${groupId}">
+		${content}
+	</span>
+</c:if>
\ No newline at end of file
Index: lams_gradebook/web/WEB-INF/tags/ImgButtonWrapper.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_gradebook/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_gradebook/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -1,37 +1,37 @@
-<% 
-/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
- 
- /**
-  * ImgButtonWrapper.tag
-  *	Author: Mitchell Seaton
-  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
-  */
- 
- %>
-<%@ tag body-content="scriptless" %>
-<div id="button-table" class="space-bottom-top">
-	<div id="button-row">
-		<jsp:doBody />
-	</div>
-</div>
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * ImgButtonWrapper.tag
+  *	Author: Mitchell Seaton
+  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
+  */
+ 
+ %>
+<%@ tag body-content="scriptless" %>
+<div id="button-table" class="space-bottom-top">
+	<div id="button-row">
+		<jsp:doBody />
+	</div>
+</div>
Index: lams_gradebook/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r24ebb6c91f49a10f1e5718036b3a3c1a80c3314f -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_gradebook/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 24ebb6c91f49a10f1e5718036b3a3c1a80c3314f)
+++ lams_gradebook/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -344,6 +344,10 @@
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
 	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
Index: lams_learning/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u
--- lams_learning/web/WEB-INF/tags/Etherpad.tag	(revision 0)
+++ lams_learning/web/WEB-INF/tags/Etherpad.tag	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -0,0 +1,98 @@
+<% 
+ /**
+  * Etherpad.tag
+  *	Author: Marcin Cieslak
+  *	Description: Etherpad pad
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+
+<%@ attribute name="groupId" required="true" rtexprvalue="true" %>
+<%@ attribute name="showControls" required="false" rtexprvalue="true" %>
+<%@ attribute name="showChat" required="false" rtexprvalue="true" %>
+<%@ attribute name="height" required="false" rtexprvalue="true" %>
+<%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
+<c:set var="etherpadServerUrl"><%=Configuration.get(ConfigurationKeys.ETHERPAD_SERVER_URL)%></c:set>
+<c:set var="localeLanguage"><lams:user property="localeLanguage" /></c:set>
+<jsp:doBody var="content" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.etherpad-initial-content {
+		display: none;
+	}
+</style>
+
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
+<script type="text/javascript">
+	$(document).ready(function(){
+		// 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;
+		
+		<c:if test="${heightAutoGrow eq 'true'}">
+			// 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:if>
+		
+		window.setTimeout(function(){
+			$.ajax({
+				url: '<lams:LAMSURL/>etherpad/getPad.do',
+				cache : false,
+				type: "GET",
+				data: {
+					groupId : '${groupId}',
+					content : $('#etherpad-initial-content-${groupId}').html()
+				},
+				dataType : 'text',
+				success: function(padId, status, xhr) {
+					lamsEtherpadTagInitialising = false;
+					if ( status == "error" ) {
+						console.log( xhr.status + " " + xhr.statusText );
+					} else {
+						// proper initialisation
+						$('#etherpad-container-${groupId}').pad({
+							'padId': padId,
+							'host':'${etherpadServerUrl}',
+							'lang':'${fn:toLowerCase(localeLanguage)}',
+							'showControls':${empty showControls ? false : showControls},
+							'showChat': ${empty showChat ? false : showChat},
+							'height': ${empty height ? 'undefined' : height}
+							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+						});
+					}
+				}
+			});
+			// wait for other pad on the page to initialise
+		}, delayBeforeInitialise);
+	});
+</script>
+
+<div class="etherpad-container" id='etherpad-container-${groupId}'></div>
+
+<%-- If content was provided, put it into a hidden div so new lines will not break JavaScript --%>
+<c:if test="${not empty content.trim()}">
+	<span class="etherpad-initial-content" id="etherpad-initial-content-${groupId}">
+		${content}
+	</span>
+</c:if>
\ No newline at end of file
Index: lams_learning/web/WEB-INF/tags/ImgButtonWrapper.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_learning/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_learning/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -1,37 +1,37 @@
-<% 
-/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
- 
- /**
-  * ImgButtonWrapper.tag
-  *	Author: Mitchell Seaton
-  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
-  */
- 
- %>
-<%@ tag body-content="scriptless" %>
-<div id="button-table" class="space-bottom-top">
-	<div id="button-row">
-		<jsp:doBody />
-	</div>
-</div>
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * ImgButtonWrapper.tag
+  *	Author: Mitchell Seaton
+  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
+  */
+ 
+ %>
+<%@ tag body-content="scriptless" %>
+<div id="button-table" class="space-bottom-top">
+	<div id="button-row">
+		<jsp:doBody />
+	</div>
+</div>
Index: lams_learning/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r24ebb6c91f49a10f1e5718036b3a3c1a80c3314f -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_learning/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 24ebb6c91f49a10f1e5718036b3a3c1a80c3314f)
+++ lams_learning/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -344,6 +344,10 @@
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
 	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
Index: lams_monitoring/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u
--- lams_monitoring/web/WEB-INF/tags/Etherpad.tag	(revision 0)
+++ lams_monitoring/web/WEB-INF/tags/Etherpad.tag	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -0,0 +1,98 @@
+<% 
+ /**
+  * Etherpad.tag
+  *	Author: Marcin Cieslak
+  *	Description: Etherpad pad
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+
+<%@ attribute name="groupId" required="true" rtexprvalue="true" %>
+<%@ attribute name="showControls" required="false" rtexprvalue="true" %>
+<%@ attribute name="showChat" required="false" rtexprvalue="true" %>
+<%@ attribute name="height" required="false" rtexprvalue="true" %>
+<%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
+<c:set var="etherpadServerUrl"><%=Configuration.get(ConfigurationKeys.ETHERPAD_SERVER_URL)%></c:set>
+<c:set var="localeLanguage"><lams:user property="localeLanguage" /></c:set>
+<jsp:doBody var="content" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.etherpad-initial-content {
+		display: none;
+	}
+</style>
+
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
+<script type="text/javascript">
+	$(document).ready(function(){
+		// 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;
+		
+		<c:if test="${heightAutoGrow eq 'true'}">
+			// 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:if>
+		
+		window.setTimeout(function(){
+			$.ajax({
+				url: '<lams:LAMSURL/>etherpad/getPad.do',
+				cache : false,
+				type: "GET",
+				data: {
+					groupId : '${groupId}',
+					content : $('#etherpad-initial-content-${groupId}').html()
+				},
+				dataType : 'text',
+				success: function(padId, status, xhr) {
+					lamsEtherpadTagInitialising = false;
+					if ( status == "error" ) {
+						console.log( xhr.status + " " + xhr.statusText );
+					} else {
+						// proper initialisation
+						$('#etherpad-container-${groupId}').pad({
+							'padId': padId,
+							'host':'${etherpadServerUrl}',
+							'lang':'${fn:toLowerCase(localeLanguage)}',
+							'showControls':${empty showControls ? false : showControls},
+							'showChat': ${empty showChat ? false : showChat},
+							'height': ${empty height ? 'undefined' : height}
+							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+						});
+					}
+				}
+			});
+			// wait for other pad on the page to initialise
+		}, delayBeforeInitialise);
+	});
+</script>
+
+<div class="etherpad-container" id='etherpad-container-${groupId}'></div>
+
+<%-- If content was provided, put it into a hidden div so new lines will not break JavaScript --%>
+<c:if test="${not empty content.trim()}">
+	<span class="etherpad-initial-content" id="etherpad-initial-content-${groupId}">
+		${content}
+	</span>
+</c:if>
\ No newline at end of file
Index: lams_monitoring/web/WEB-INF/tags/ImgButtonWrapper.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_monitoring/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_monitoring/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -1,37 +1,37 @@
-<% 
-/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
- 
- /**
-  * ImgButtonWrapper.tag
-  *	Author: Mitchell Seaton
-  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
-  */
- 
- %>
-<%@ tag body-content="scriptless" %>
-<div id="button-table" class="space-bottom-top">
-	<div id="button-row">
-		<jsp:doBody />
-	</div>
-</div>
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * ImgButtonWrapper.tag
+  *	Author: Mitchell Seaton
+  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
+  */
+ 
+ %>
+<%@ tag body-content="scriptless" %>
+<div id="button-table" class="space-bottom-top">
+	<div id="button-row">
+		<jsp:doBody />
+	</div>
+</div>
Index: lams_monitoring/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r24ebb6c91f49a10f1e5718036b3a3c1a80c3314f -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_monitoring/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 24ebb6c91f49a10f1e5718036b3a3c1a80c3314f)
+++ lams_monitoring/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -344,6 +344,10 @@
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
 	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
Index: lams_tool_assessment/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u
--- lams_tool_assessment/web/WEB-INF/tags/Etherpad.tag	(revision 0)
+++ lams_tool_assessment/web/WEB-INF/tags/Etherpad.tag	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -0,0 +1,98 @@
+<% 
+ /**
+  * Etherpad.tag
+  *	Author: Marcin Cieslak
+  *	Description: Etherpad pad
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+
+<%@ attribute name="groupId" required="true" rtexprvalue="true" %>
+<%@ attribute name="showControls" required="false" rtexprvalue="true" %>
+<%@ attribute name="showChat" required="false" rtexprvalue="true" %>
+<%@ attribute name="height" required="false" rtexprvalue="true" %>
+<%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
+<c:set var="etherpadServerUrl"><%=Configuration.get(ConfigurationKeys.ETHERPAD_SERVER_URL)%></c:set>
+<c:set var="localeLanguage"><lams:user property="localeLanguage" /></c:set>
+<jsp:doBody var="content" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.etherpad-initial-content {
+		display: none;
+	}
+</style>
+
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
+<script type="text/javascript">
+	$(document).ready(function(){
+		// 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;
+		
+		<c:if test="${heightAutoGrow eq 'true'}">
+			// 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:if>
+		
+		window.setTimeout(function(){
+			$.ajax({
+				url: '<lams:LAMSURL/>etherpad/getPad.do',
+				cache : false,
+				type: "GET",
+				data: {
+					groupId : '${groupId}',
+					content : $('#etherpad-initial-content-${groupId}').html()
+				},
+				dataType : 'text',
+				success: function(padId, status, xhr) {
+					lamsEtherpadTagInitialising = false;
+					if ( status == "error" ) {
+						console.log( xhr.status + " " + xhr.statusText );
+					} else {
+						// proper initialisation
+						$('#etherpad-container-${groupId}').pad({
+							'padId': padId,
+							'host':'${etherpadServerUrl}',
+							'lang':'${fn:toLowerCase(localeLanguage)}',
+							'showControls':${empty showControls ? false : showControls},
+							'showChat': ${empty showChat ? false : showChat},
+							'height': ${empty height ? 'undefined' : height}
+							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+						});
+					}
+				}
+			});
+			// wait for other pad on the page to initialise
+		}, delayBeforeInitialise);
+	});
+</script>
+
+<div class="etherpad-container" id='etherpad-container-${groupId}'></div>
+
+<%-- If content was provided, put it into a hidden div so new lines will not break JavaScript --%>
+<c:if test="${not empty content.trim()}">
+	<span class="etherpad-initial-content" id="etherpad-initial-content-${groupId}">
+		${content}
+	</span>
+</c:if>
\ No newline at end of file
Index: lams_tool_assessment/web/WEB-INF/tags/ImgButtonWrapper.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_tool_assessment/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_assessment/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -1,37 +1,37 @@
-<% 
-/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
- 
- /**
-  * ImgButtonWrapper.tag
-  *	Author: Mitchell Seaton
-  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
-  */
- 
- %>
-<%@ tag body-content="scriptless" %>
-<div id="button-table" class="space-bottom-top">
-	<div id="button-row">
-		<jsp:doBody />
-	</div>
-</div>
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * ImgButtonWrapper.tag
+  *	Author: Mitchell Seaton
+  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
+  */
+ 
+ %>
+<%@ tag body-content="scriptless" %>
+<div id="button-table" class="space-bottom-top">
+	<div id="button-row">
+		<jsp:doBody />
+	</div>
+</div>
Index: lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r24ebb6c91f49a10f1e5718036b3a3c1a80c3314f -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 24ebb6c91f49a10f1e5718036b3a3c1a80c3314f)
+++ lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -344,6 +344,10 @@
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
 	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
Index: lams_tool_chat/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u
--- lams_tool_chat/web/WEB-INF/tags/Etherpad.tag	(revision 0)
+++ lams_tool_chat/web/WEB-INF/tags/Etherpad.tag	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -0,0 +1,98 @@
+<% 
+ /**
+  * Etherpad.tag
+  *	Author: Marcin Cieslak
+  *	Description: Etherpad pad
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+
+<%@ attribute name="groupId" required="true" rtexprvalue="true" %>
+<%@ attribute name="showControls" required="false" rtexprvalue="true" %>
+<%@ attribute name="showChat" required="false" rtexprvalue="true" %>
+<%@ attribute name="height" required="false" rtexprvalue="true" %>
+<%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
+<c:set var="etherpadServerUrl"><%=Configuration.get(ConfigurationKeys.ETHERPAD_SERVER_URL)%></c:set>
+<c:set var="localeLanguage"><lams:user property="localeLanguage" /></c:set>
+<jsp:doBody var="content" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.etherpad-initial-content {
+		display: none;
+	}
+</style>
+
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
+<script type="text/javascript">
+	$(document).ready(function(){
+		// 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;
+		
+		<c:if test="${heightAutoGrow eq 'true'}">
+			// 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:if>
+		
+		window.setTimeout(function(){
+			$.ajax({
+				url: '<lams:LAMSURL/>etherpad/getPad.do',
+				cache : false,
+				type: "GET",
+				data: {
+					groupId : '${groupId}',
+					content : $('#etherpad-initial-content-${groupId}').html()
+				},
+				dataType : 'text',
+				success: function(padId, status, xhr) {
+					lamsEtherpadTagInitialising = false;
+					if ( status == "error" ) {
+						console.log( xhr.status + " " + xhr.statusText );
+					} else {
+						// proper initialisation
+						$('#etherpad-container-${groupId}').pad({
+							'padId': padId,
+							'host':'${etherpadServerUrl}',
+							'lang':'${fn:toLowerCase(localeLanguage)}',
+							'showControls':${empty showControls ? false : showControls},
+							'showChat': ${empty showChat ? false : showChat},
+							'height': ${empty height ? 'undefined' : height}
+							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+						});
+					}
+				}
+			});
+			// wait for other pad on the page to initialise
+		}, delayBeforeInitialise);
+	});
+</script>
+
+<div class="etherpad-container" id='etherpad-container-${groupId}'></div>
+
+<%-- If content was provided, put it into a hidden div so new lines will not break JavaScript --%>
+<c:if test="${not empty content.trim()}">
+	<span class="etherpad-initial-content" id="etherpad-initial-content-${groupId}">
+		${content}
+	</span>
+</c:if>
\ No newline at end of file
Index: lams_tool_chat/web/WEB-INF/tags/ImgButtonWrapper.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_tool_chat/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_chat/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -1,37 +1,37 @@
-<% 
-/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
- 
- /**
-  * ImgButtonWrapper.tag
-  *	Author: Mitchell Seaton
-  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
-  */
- 
- %>
-<%@ tag body-content="scriptless" %>
-<div id="button-table" class="space-bottom-top">
-	<div id="button-row">
-		<jsp:doBody />
-	</div>
-</div>
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * ImgButtonWrapper.tag
+  *	Author: Mitchell Seaton
+  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
+  */
+ 
+ %>
+<%@ tag body-content="scriptless" %>
+<div id="button-table" class="space-bottom-top">
+	<div id="button-row">
+		<jsp:doBody />
+	</div>
+</div>
Index: lams_tool_chat/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r24ebb6c91f49a10f1e5718036b3a3c1a80c3314f -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_tool_chat/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 24ebb6c91f49a10f1e5718036b3a3c1a80c3314f)
+++ lams_tool_chat/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -344,6 +344,10 @@
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
 	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
Index: lams_tool_daco/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u
--- lams_tool_daco/web/WEB-INF/tags/Etherpad.tag	(revision 0)
+++ lams_tool_daco/web/WEB-INF/tags/Etherpad.tag	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -0,0 +1,98 @@
+<% 
+ /**
+  * Etherpad.tag
+  *	Author: Marcin Cieslak
+  *	Description: Etherpad pad
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+
+<%@ attribute name="groupId" required="true" rtexprvalue="true" %>
+<%@ attribute name="showControls" required="false" rtexprvalue="true" %>
+<%@ attribute name="showChat" required="false" rtexprvalue="true" %>
+<%@ attribute name="height" required="false" rtexprvalue="true" %>
+<%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
+<c:set var="etherpadServerUrl"><%=Configuration.get(ConfigurationKeys.ETHERPAD_SERVER_URL)%></c:set>
+<c:set var="localeLanguage"><lams:user property="localeLanguage" /></c:set>
+<jsp:doBody var="content" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.etherpad-initial-content {
+		display: none;
+	}
+</style>
+
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
+<script type="text/javascript">
+	$(document).ready(function(){
+		// 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;
+		
+		<c:if test="${heightAutoGrow eq 'true'}">
+			// 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:if>
+		
+		window.setTimeout(function(){
+			$.ajax({
+				url: '<lams:LAMSURL/>etherpad/getPad.do',
+				cache : false,
+				type: "GET",
+				data: {
+					groupId : '${groupId}',
+					content : $('#etherpad-initial-content-${groupId}').html()
+				},
+				dataType : 'text',
+				success: function(padId, status, xhr) {
+					lamsEtherpadTagInitialising = false;
+					if ( status == "error" ) {
+						console.log( xhr.status + " " + xhr.statusText );
+					} else {
+						// proper initialisation
+						$('#etherpad-container-${groupId}').pad({
+							'padId': padId,
+							'host':'${etherpadServerUrl}',
+							'lang':'${fn:toLowerCase(localeLanguage)}',
+							'showControls':${empty showControls ? false : showControls},
+							'showChat': ${empty showChat ? false : showChat},
+							'height': ${empty height ? 'undefined' : height}
+							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+						});
+					}
+				}
+			});
+			// wait for other pad on the page to initialise
+		}, delayBeforeInitialise);
+	});
+</script>
+
+<div class="etherpad-container" id='etherpad-container-${groupId}'></div>
+
+<%-- If content was provided, put it into a hidden div so new lines will not break JavaScript --%>
+<c:if test="${not empty content.trim()}">
+	<span class="etherpad-initial-content" id="etherpad-initial-content-${groupId}">
+		${content}
+	</span>
+</c:if>
\ No newline at end of file
Index: lams_tool_daco/web/WEB-INF/tags/ImgButtonWrapper.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_tool_daco/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_daco/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -1,37 +1,37 @@
-<% 
-/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
- 
- /**
-  * ImgButtonWrapper.tag
-  *	Author: Mitchell Seaton
-  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
-  */
- 
- %>
-<%@ tag body-content="scriptless" %>
-<div id="button-table" class="space-bottom-top">
-	<div id="button-row">
-		<jsp:doBody />
-	</div>
-</div>
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * ImgButtonWrapper.tag
+  *	Author: Mitchell Seaton
+  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
+  */
+ 
+ %>
+<%@ tag body-content="scriptless" %>
+<div id="button-table" class="space-bottom-top">
+	<div id="button-row">
+		<jsp:doBody />
+	</div>
+</div>
Index: lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r24ebb6c91f49a10f1e5718036b3a3c1a80c3314f -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 24ebb6c91f49a10f1e5718036b3a3c1a80c3314f)
+++ lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -344,6 +344,10 @@
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
 	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
Index: lams_tool_doku/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u
--- lams_tool_doku/web/WEB-INF/tags/Etherpad.tag	(revision 0)
+++ lams_tool_doku/web/WEB-INF/tags/Etherpad.tag	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -0,0 +1,98 @@
+<% 
+ /**
+  * Etherpad.tag
+  *	Author: Marcin Cieslak
+  *	Description: Etherpad pad
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+
+<%@ attribute name="groupId" required="true" rtexprvalue="true" %>
+<%@ attribute name="showControls" required="false" rtexprvalue="true" %>
+<%@ attribute name="showChat" required="false" rtexprvalue="true" %>
+<%@ attribute name="height" required="false" rtexprvalue="true" %>
+<%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
+<c:set var="etherpadServerUrl"><%=Configuration.get(ConfigurationKeys.ETHERPAD_SERVER_URL)%></c:set>
+<c:set var="localeLanguage"><lams:user property="localeLanguage" /></c:set>
+<jsp:doBody var="content" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.etherpad-initial-content {
+		display: none;
+	}
+</style>
+
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
+<script type="text/javascript">
+	$(document).ready(function(){
+		// 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;
+		
+		<c:if test="${heightAutoGrow eq 'true'}">
+			// 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:if>
+		
+		window.setTimeout(function(){
+			$.ajax({
+				url: '<lams:LAMSURL/>etherpad/getPad.do',
+				cache : false,
+				type: "GET",
+				data: {
+					groupId : '${groupId}',
+					content : $('#etherpad-initial-content-${groupId}').html()
+				},
+				dataType : 'text',
+				success: function(padId, status, xhr) {
+					lamsEtherpadTagInitialising = false;
+					if ( status == "error" ) {
+						console.log( xhr.status + " " + xhr.statusText );
+					} else {
+						// proper initialisation
+						$('#etherpad-container-${groupId}').pad({
+							'padId': padId,
+							'host':'${etherpadServerUrl}',
+							'lang':'${fn:toLowerCase(localeLanguage)}',
+							'showControls':${empty showControls ? false : showControls},
+							'showChat': ${empty showChat ? false : showChat},
+							'height': ${empty height ? 'undefined' : height}
+							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+						});
+					}
+				}
+			});
+			// wait for other pad on the page to initialise
+		}, delayBeforeInitialise);
+	});
+</script>
+
+<div class="etherpad-container" id='etherpad-container-${groupId}'></div>
+
+<%-- If content was provided, put it into a hidden div so new lines will not break JavaScript --%>
+<c:if test="${not empty content.trim()}">
+	<span class="etherpad-initial-content" id="etherpad-initial-content-${groupId}">
+		${content}
+	</span>
+</c:if>
\ No newline at end of file
Index: lams_tool_doku/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r24ebb6c91f49a10f1e5718036b3a3c1a80c3314f -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_tool_doku/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 24ebb6c91f49a10f1e5718036b3a3c1a80c3314f)
+++ lams_tool_doku/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -344,6 +344,10 @@
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
 	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
Index: lams_tool_forum/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u
--- lams_tool_forum/web/WEB-INF/tags/Etherpad.tag	(revision 0)
+++ lams_tool_forum/web/WEB-INF/tags/Etherpad.tag	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -0,0 +1,98 @@
+<% 
+ /**
+  * Etherpad.tag
+  *	Author: Marcin Cieslak
+  *	Description: Etherpad pad
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+
+<%@ attribute name="groupId" required="true" rtexprvalue="true" %>
+<%@ attribute name="showControls" required="false" rtexprvalue="true" %>
+<%@ attribute name="showChat" required="false" rtexprvalue="true" %>
+<%@ attribute name="height" required="false" rtexprvalue="true" %>
+<%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
+<c:set var="etherpadServerUrl"><%=Configuration.get(ConfigurationKeys.ETHERPAD_SERVER_URL)%></c:set>
+<c:set var="localeLanguage"><lams:user property="localeLanguage" /></c:set>
+<jsp:doBody var="content" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.etherpad-initial-content {
+		display: none;
+	}
+</style>
+
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
+<script type="text/javascript">
+	$(document).ready(function(){
+		// 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;
+		
+		<c:if test="${heightAutoGrow eq 'true'}">
+			// 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:if>
+		
+		window.setTimeout(function(){
+			$.ajax({
+				url: '<lams:LAMSURL/>etherpad/getPad.do',
+				cache : false,
+				type: "GET",
+				data: {
+					groupId : '${groupId}',
+					content : $('#etherpad-initial-content-${groupId}').html()
+				},
+				dataType : 'text',
+				success: function(padId, status, xhr) {
+					lamsEtherpadTagInitialising = false;
+					if ( status == "error" ) {
+						console.log( xhr.status + " " + xhr.statusText );
+					} else {
+						// proper initialisation
+						$('#etherpad-container-${groupId}').pad({
+							'padId': padId,
+							'host':'${etherpadServerUrl}',
+							'lang':'${fn:toLowerCase(localeLanguage)}',
+							'showControls':${empty showControls ? false : showControls},
+							'showChat': ${empty showChat ? false : showChat},
+							'height': ${empty height ? 'undefined' : height}
+							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+						});
+					}
+				}
+			});
+			// wait for other pad on the page to initialise
+		}, delayBeforeInitialise);
+	});
+</script>
+
+<div class="etherpad-container" id='etherpad-container-${groupId}'></div>
+
+<%-- If content was provided, put it into a hidden div so new lines will not break JavaScript --%>
+<c:if test="${not empty content.trim()}">
+	<span class="etherpad-initial-content" id="etherpad-initial-content-${groupId}">
+		${content}
+	</span>
+</c:if>
\ No newline at end of file
Index: lams_tool_forum/web/WEB-INF/tags/ImgButtonWrapper.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_tool_forum/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_forum/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -1,37 +1,37 @@
-<% 
-/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
- 
- /**
-  * ImgButtonWrapper.tag
-  *	Author: Mitchell Seaton
-  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
-  */
- 
- %>
-<%@ tag body-content="scriptless" %>
-<div id="button-table" class="space-bottom-top">
-	<div id="button-row">
-		<jsp:doBody />
-	</div>
-</div>
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * ImgButtonWrapper.tag
+  *	Author: Mitchell Seaton
+  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
+  */
+ 
+ %>
+<%@ tag body-content="scriptless" %>
+<div id="button-table" class="space-bottom-top">
+	<div id="button-row">
+		<jsp:doBody />
+	</div>
+</div>
Index: lams_tool_forum/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r24ebb6c91f49a10f1e5718036b3a3c1a80c3314f -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_tool_forum/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 24ebb6c91f49a10f1e5718036b3a3c1a80c3314f)
+++ lams_tool_forum/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -344,6 +344,10 @@
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
 	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
Index: lams_tool_gmap/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u
--- lams_tool_gmap/web/WEB-INF/tags/Etherpad.tag	(revision 0)
+++ lams_tool_gmap/web/WEB-INF/tags/Etherpad.tag	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -0,0 +1,98 @@
+<% 
+ /**
+  * Etherpad.tag
+  *	Author: Marcin Cieslak
+  *	Description: Etherpad pad
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+
+<%@ attribute name="groupId" required="true" rtexprvalue="true" %>
+<%@ attribute name="showControls" required="false" rtexprvalue="true" %>
+<%@ attribute name="showChat" required="false" rtexprvalue="true" %>
+<%@ attribute name="height" required="false" rtexprvalue="true" %>
+<%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
+<c:set var="etherpadServerUrl"><%=Configuration.get(ConfigurationKeys.ETHERPAD_SERVER_URL)%></c:set>
+<c:set var="localeLanguage"><lams:user property="localeLanguage" /></c:set>
+<jsp:doBody var="content" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.etherpad-initial-content {
+		display: none;
+	}
+</style>
+
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
+<script type="text/javascript">
+	$(document).ready(function(){
+		// 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;
+		
+		<c:if test="${heightAutoGrow eq 'true'}">
+			// 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:if>
+		
+		window.setTimeout(function(){
+			$.ajax({
+				url: '<lams:LAMSURL/>etherpad/getPad.do',
+				cache : false,
+				type: "GET",
+				data: {
+					groupId : '${groupId}',
+					content : $('#etherpad-initial-content-${groupId}').html()
+				},
+				dataType : 'text',
+				success: function(padId, status, xhr) {
+					lamsEtherpadTagInitialising = false;
+					if ( status == "error" ) {
+						console.log( xhr.status + " " + xhr.statusText );
+					} else {
+						// proper initialisation
+						$('#etherpad-container-${groupId}').pad({
+							'padId': padId,
+							'host':'${etherpadServerUrl}',
+							'lang':'${fn:toLowerCase(localeLanguage)}',
+							'showControls':${empty showControls ? false : showControls},
+							'showChat': ${empty showChat ? false : showChat},
+							'height': ${empty height ? 'undefined' : height}
+							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+						});
+					}
+				}
+			});
+			// wait for other pad on the page to initialise
+		}, delayBeforeInitialise);
+	});
+</script>
+
+<div class="etherpad-container" id='etherpad-container-${groupId}'></div>
+
+<%-- If content was provided, put it into a hidden div so new lines will not break JavaScript --%>
+<c:if test="${not empty content.trim()}">
+	<span class="etherpad-initial-content" id="etherpad-initial-content-${groupId}">
+		${content}
+	</span>
+</c:if>
\ No newline at end of file
Index: lams_tool_gmap/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r24ebb6c91f49a10f1e5718036b3a3c1a80c3314f -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_tool_gmap/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 24ebb6c91f49a10f1e5718036b3a3c1a80c3314f)
+++ lams_tool_gmap/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -344,6 +344,10 @@
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
 	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
Index: lams_tool_images/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u
--- lams_tool_images/web/WEB-INF/tags/Etherpad.tag	(revision 0)
+++ lams_tool_images/web/WEB-INF/tags/Etherpad.tag	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -0,0 +1,98 @@
+<% 
+ /**
+  * Etherpad.tag
+  *	Author: Marcin Cieslak
+  *	Description: Etherpad pad
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+
+<%@ attribute name="groupId" required="true" rtexprvalue="true" %>
+<%@ attribute name="showControls" required="false" rtexprvalue="true" %>
+<%@ attribute name="showChat" required="false" rtexprvalue="true" %>
+<%@ attribute name="height" required="false" rtexprvalue="true" %>
+<%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
+<c:set var="etherpadServerUrl"><%=Configuration.get(ConfigurationKeys.ETHERPAD_SERVER_URL)%></c:set>
+<c:set var="localeLanguage"><lams:user property="localeLanguage" /></c:set>
+<jsp:doBody var="content" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.etherpad-initial-content {
+		display: none;
+	}
+</style>
+
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
+<script type="text/javascript">
+	$(document).ready(function(){
+		// 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;
+		
+		<c:if test="${heightAutoGrow eq 'true'}">
+			// 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:if>
+		
+		window.setTimeout(function(){
+			$.ajax({
+				url: '<lams:LAMSURL/>etherpad/getPad.do',
+				cache : false,
+				type: "GET",
+				data: {
+					groupId : '${groupId}',
+					content : $('#etherpad-initial-content-${groupId}').html()
+				},
+				dataType : 'text',
+				success: function(padId, status, xhr) {
+					lamsEtherpadTagInitialising = false;
+					if ( status == "error" ) {
+						console.log( xhr.status + " " + xhr.statusText );
+					} else {
+						// proper initialisation
+						$('#etherpad-container-${groupId}').pad({
+							'padId': padId,
+							'host':'${etherpadServerUrl}',
+							'lang':'${fn:toLowerCase(localeLanguage)}',
+							'showControls':${empty showControls ? false : showControls},
+							'showChat': ${empty showChat ? false : showChat},
+							'height': ${empty height ? 'undefined' : height}
+							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+						});
+					}
+				}
+			});
+			// wait for other pad on the page to initialise
+		}, delayBeforeInitialise);
+	});
+</script>
+
+<div class="etherpad-container" id='etherpad-container-${groupId}'></div>
+
+<%-- If content was provided, put it into a hidden div so new lines will not break JavaScript --%>
+<c:if test="${not empty content.trim()}">
+	<span class="etherpad-initial-content" id="etherpad-initial-content-${groupId}">
+		${content}
+	</span>
+</c:if>
\ No newline at end of file
Index: lams_tool_images/web/WEB-INF/tags/ImgButtonWrapper.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_tool_images/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_images/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -1,37 +1,37 @@
-<% 
-/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
- 
- /**
-  * ImgButtonWrapper.tag
-  *	Author: Mitchell Seaton
-  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
-  */
- 
- %>
-<%@ tag body-content="scriptless" %>
-<div id="button-table" class="space-bottom-top">
-	<div id="button-row">
-		<jsp:doBody />
-	</div>
-</div>
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * ImgButtonWrapper.tag
+  *	Author: Mitchell Seaton
+  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
+  */
+ 
+ %>
+<%@ tag body-content="scriptless" %>
+<div id="button-table" class="space-bottom-top">
+	<div id="button-row">
+		<jsp:doBody />
+	</div>
+</div>
Index: lams_tool_images/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r24ebb6c91f49a10f1e5718036b3a3c1a80c3314f -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_tool_images/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 24ebb6c91f49a10f1e5718036b3a3c1a80c3314f)
+++ lams_tool_images/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -344,6 +344,10 @@
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
 	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
Index: lams_tool_imscc/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u
--- lams_tool_imscc/web/WEB-INF/tags/Etherpad.tag	(revision 0)
+++ lams_tool_imscc/web/WEB-INF/tags/Etherpad.tag	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -0,0 +1,98 @@
+<% 
+ /**
+  * Etherpad.tag
+  *	Author: Marcin Cieslak
+  *	Description: Etherpad pad
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+
+<%@ attribute name="groupId" required="true" rtexprvalue="true" %>
+<%@ attribute name="showControls" required="false" rtexprvalue="true" %>
+<%@ attribute name="showChat" required="false" rtexprvalue="true" %>
+<%@ attribute name="height" required="false" rtexprvalue="true" %>
+<%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
+<c:set var="etherpadServerUrl"><%=Configuration.get(ConfigurationKeys.ETHERPAD_SERVER_URL)%></c:set>
+<c:set var="localeLanguage"><lams:user property="localeLanguage" /></c:set>
+<jsp:doBody var="content" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.etherpad-initial-content {
+		display: none;
+	}
+</style>
+
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
+<script type="text/javascript">
+	$(document).ready(function(){
+		// 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;
+		
+		<c:if test="${heightAutoGrow eq 'true'}">
+			// 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:if>
+		
+		window.setTimeout(function(){
+			$.ajax({
+				url: '<lams:LAMSURL/>etherpad/getPad.do',
+				cache : false,
+				type: "GET",
+				data: {
+					groupId : '${groupId}',
+					content : $('#etherpad-initial-content-${groupId}').html()
+				},
+				dataType : 'text',
+				success: function(padId, status, xhr) {
+					lamsEtherpadTagInitialising = false;
+					if ( status == "error" ) {
+						console.log( xhr.status + " " + xhr.statusText );
+					} else {
+						// proper initialisation
+						$('#etherpad-container-${groupId}').pad({
+							'padId': padId,
+							'host':'${etherpadServerUrl}',
+							'lang':'${fn:toLowerCase(localeLanguage)}',
+							'showControls':${empty showControls ? false : showControls},
+							'showChat': ${empty showChat ? false : showChat},
+							'height': ${empty height ? 'undefined' : height}
+							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+						});
+					}
+				}
+			});
+			// wait for other pad on the page to initialise
+		}, delayBeforeInitialise);
+	});
+</script>
+
+<div class="etherpad-container" id='etherpad-container-${groupId}'></div>
+
+<%-- If content was provided, put it into a hidden div so new lines will not break JavaScript --%>
+<c:if test="${not empty content.trim()}">
+	<span class="etherpad-initial-content" id="etherpad-initial-content-${groupId}">
+		${content}
+	</span>
+</c:if>
\ No newline at end of file
Index: lams_tool_imscc/web/WEB-INF/tags/ImgButtonWrapper.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_tool_imscc/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_imscc/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -1,37 +1,37 @@
-<% 
-/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
- 
- /**
-  * ImgButtonWrapper.tag
-  *	Author: Mitchell Seaton
-  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
-  */
- 
- %>
-<%@ tag body-content="scriptless" %>
-<div id="button-table" class="space-bottom-top">
-	<div id="button-row">
-		<jsp:doBody />
-	</div>
-</div>
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * ImgButtonWrapper.tag
+  *	Author: Mitchell Seaton
+  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
+  */
+ 
+ %>
+<%@ tag body-content="scriptless" %>
+<div id="button-table" class="space-bottom-top">
+	<div id="button-row">
+		<jsp:doBody />
+	</div>
+</div>
Index: lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r24ebb6c91f49a10f1e5718036b3a3c1a80c3314f -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 24ebb6c91f49a10f1e5718036b3a3c1a80c3314f)
+++ lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -344,6 +344,10 @@
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
 	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
Index: lams_tool_lamc/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u
--- lams_tool_lamc/web/WEB-INF/tags/Etherpad.tag	(revision 0)
+++ lams_tool_lamc/web/WEB-INF/tags/Etherpad.tag	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -0,0 +1,98 @@
+<% 
+ /**
+  * Etherpad.tag
+  *	Author: Marcin Cieslak
+  *	Description: Etherpad pad
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+
+<%@ attribute name="groupId" required="true" rtexprvalue="true" %>
+<%@ attribute name="showControls" required="false" rtexprvalue="true" %>
+<%@ attribute name="showChat" required="false" rtexprvalue="true" %>
+<%@ attribute name="height" required="false" rtexprvalue="true" %>
+<%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
+<c:set var="etherpadServerUrl"><%=Configuration.get(ConfigurationKeys.ETHERPAD_SERVER_URL)%></c:set>
+<c:set var="localeLanguage"><lams:user property="localeLanguage" /></c:set>
+<jsp:doBody var="content" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.etherpad-initial-content {
+		display: none;
+	}
+</style>
+
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
+<script type="text/javascript">
+	$(document).ready(function(){
+		// 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;
+		
+		<c:if test="${heightAutoGrow eq 'true'}">
+			// 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:if>
+		
+		window.setTimeout(function(){
+			$.ajax({
+				url: '<lams:LAMSURL/>etherpad/getPad.do',
+				cache : false,
+				type: "GET",
+				data: {
+					groupId : '${groupId}',
+					content : $('#etherpad-initial-content-${groupId}').html()
+				},
+				dataType : 'text',
+				success: function(padId, status, xhr) {
+					lamsEtherpadTagInitialising = false;
+					if ( status == "error" ) {
+						console.log( xhr.status + " " + xhr.statusText );
+					} else {
+						// proper initialisation
+						$('#etherpad-container-${groupId}').pad({
+							'padId': padId,
+							'host':'${etherpadServerUrl}',
+							'lang':'${fn:toLowerCase(localeLanguage)}',
+							'showControls':${empty showControls ? false : showControls},
+							'showChat': ${empty showChat ? false : showChat},
+							'height': ${empty height ? 'undefined' : height}
+							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+						});
+					}
+				}
+			});
+			// wait for other pad on the page to initialise
+		}, delayBeforeInitialise);
+	});
+</script>
+
+<div class="etherpad-container" id='etherpad-container-${groupId}'></div>
+
+<%-- If content was provided, put it into a hidden div so new lines will not break JavaScript --%>
+<c:if test="${not empty content.trim()}">
+	<span class="etherpad-initial-content" id="etherpad-initial-content-${groupId}">
+		${content}
+	</span>
+</c:if>
\ No newline at end of file
Index: lams_tool_lamc/web/WEB-INF/tags/ImgButtonWrapper.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_tool_lamc/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_lamc/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -1,37 +1,37 @@
-<% 
-/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
- 
- /**
-  * ImgButtonWrapper.tag
-  *	Author: Mitchell Seaton
-  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
-  */
- 
- %>
-<%@ tag body-content="scriptless" %>
-<div id="button-table" class="space-bottom-top">
-	<div id="button-row">
-		<jsp:doBody />
-	</div>
-</div>
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * ImgButtonWrapper.tag
+  *	Author: Mitchell Seaton
+  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
+  */
+ 
+ %>
+<%@ tag body-content="scriptless" %>
+<div id="button-table" class="space-bottom-top">
+	<div id="button-row">
+		<jsp:doBody />
+	</div>
+</div>
Index: lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r24ebb6c91f49a10f1e5718036b3a3c1a80c3314f -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 24ebb6c91f49a10f1e5718036b3a3c1a80c3314f)
+++ lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -344,6 +344,10 @@
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
 	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
Index: lams_tool_laqa/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u
--- lams_tool_laqa/web/WEB-INF/tags/Etherpad.tag	(revision 0)
+++ lams_tool_laqa/web/WEB-INF/tags/Etherpad.tag	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -0,0 +1,98 @@
+<% 
+ /**
+  * Etherpad.tag
+  *	Author: Marcin Cieslak
+  *	Description: Etherpad pad
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+
+<%@ attribute name="groupId" required="true" rtexprvalue="true" %>
+<%@ attribute name="showControls" required="false" rtexprvalue="true" %>
+<%@ attribute name="showChat" required="false" rtexprvalue="true" %>
+<%@ attribute name="height" required="false" rtexprvalue="true" %>
+<%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
+<c:set var="etherpadServerUrl"><%=Configuration.get(ConfigurationKeys.ETHERPAD_SERVER_URL)%></c:set>
+<c:set var="localeLanguage"><lams:user property="localeLanguage" /></c:set>
+<jsp:doBody var="content" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.etherpad-initial-content {
+		display: none;
+	}
+</style>
+
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
+<script type="text/javascript">
+	$(document).ready(function(){
+		// 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;
+		
+		<c:if test="${heightAutoGrow eq 'true'}">
+			// 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:if>
+		
+		window.setTimeout(function(){
+			$.ajax({
+				url: '<lams:LAMSURL/>etherpad/getPad.do',
+				cache : false,
+				type: "GET",
+				data: {
+					groupId : '${groupId}',
+					content : $('#etherpad-initial-content-${groupId}').html()
+				},
+				dataType : 'text',
+				success: function(padId, status, xhr) {
+					lamsEtherpadTagInitialising = false;
+					if ( status == "error" ) {
+						console.log( xhr.status + " " + xhr.statusText );
+					} else {
+						// proper initialisation
+						$('#etherpad-container-${groupId}').pad({
+							'padId': padId,
+							'host':'${etherpadServerUrl}',
+							'lang':'${fn:toLowerCase(localeLanguage)}',
+							'showControls':${empty showControls ? false : showControls},
+							'showChat': ${empty showChat ? false : showChat},
+							'height': ${empty height ? 'undefined' : height}
+							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+						});
+					}
+				}
+			});
+			// wait for other pad on the page to initialise
+		}, delayBeforeInitialise);
+	});
+</script>
+
+<div class="etherpad-container" id='etherpad-container-${groupId}'></div>
+
+<%-- If content was provided, put it into a hidden div so new lines will not break JavaScript --%>
+<c:if test="${not empty content.trim()}">
+	<span class="etherpad-initial-content" id="etherpad-initial-content-${groupId}">
+		${content}
+	</span>
+</c:if>
\ No newline at end of file
Index: lams_tool_laqa/web/WEB-INF/tags/ImgButtonWrapper.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_tool_laqa/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_laqa/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -1,37 +1,37 @@
-<% 
-/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
- 
- /**
-  * ImgButtonWrapper.tag
-  *	Author: Mitchell Seaton
-  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
-  */
- 
- %>
-<%@ tag body-content="scriptless" %>
-<div id="button-table" class="space-bottom-top">
-	<div id="button-row">
-		<jsp:doBody />
-	</div>
-</div>
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * ImgButtonWrapper.tag
+  *	Author: Mitchell Seaton
+  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
+  */
+ 
+ %>
+<%@ tag body-content="scriptless" %>
+<div id="button-table" class="space-bottom-top">
+	<div id="button-row">
+		<jsp:doBody />
+	</div>
+</div>
Index: lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r24ebb6c91f49a10f1e5718036b3a3c1a80c3314f -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 24ebb6c91f49a10f1e5718036b3a3c1a80c3314f)
+++ lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -344,6 +344,10 @@
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
 	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
Index: lams_tool_larsrc/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u
--- lams_tool_larsrc/web/WEB-INF/tags/Etherpad.tag	(revision 0)
+++ lams_tool_larsrc/web/WEB-INF/tags/Etherpad.tag	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -0,0 +1,98 @@
+<% 
+ /**
+  * Etherpad.tag
+  *	Author: Marcin Cieslak
+  *	Description: Etherpad pad
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+
+<%@ attribute name="groupId" required="true" rtexprvalue="true" %>
+<%@ attribute name="showControls" required="false" rtexprvalue="true" %>
+<%@ attribute name="showChat" required="false" rtexprvalue="true" %>
+<%@ attribute name="height" required="false" rtexprvalue="true" %>
+<%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
+<c:set var="etherpadServerUrl"><%=Configuration.get(ConfigurationKeys.ETHERPAD_SERVER_URL)%></c:set>
+<c:set var="localeLanguage"><lams:user property="localeLanguage" /></c:set>
+<jsp:doBody var="content" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.etherpad-initial-content {
+		display: none;
+	}
+</style>
+
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
+<script type="text/javascript">
+	$(document).ready(function(){
+		// 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;
+		
+		<c:if test="${heightAutoGrow eq 'true'}">
+			// 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:if>
+		
+		window.setTimeout(function(){
+			$.ajax({
+				url: '<lams:LAMSURL/>etherpad/getPad.do',
+				cache : false,
+				type: "GET",
+				data: {
+					groupId : '${groupId}',
+					content : $('#etherpad-initial-content-${groupId}').html()
+				},
+				dataType : 'text',
+				success: function(padId, status, xhr) {
+					lamsEtherpadTagInitialising = false;
+					if ( status == "error" ) {
+						console.log( xhr.status + " " + xhr.statusText );
+					} else {
+						// proper initialisation
+						$('#etherpad-container-${groupId}').pad({
+							'padId': padId,
+							'host':'${etherpadServerUrl}',
+							'lang':'${fn:toLowerCase(localeLanguage)}',
+							'showControls':${empty showControls ? false : showControls},
+							'showChat': ${empty showChat ? false : showChat},
+							'height': ${empty height ? 'undefined' : height}
+							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+						});
+					}
+				}
+			});
+			// wait for other pad on the page to initialise
+		}, delayBeforeInitialise);
+	});
+</script>
+
+<div class="etherpad-container" id='etherpad-container-${groupId}'></div>
+
+<%-- If content was provided, put it into a hidden div so new lines will not break JavaScript --%>
+<c:if test="${not empty content.trim()}">
+	<span class="etherpad-initial-content" id="etherpad-initial-content-${groupId}">
+		${content}
+	</span>
+</c:if>
\ No newline at end of file
Index: lams_tool_larsrc/web/WEB-INF/tags/ImgButtonWrapper.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_tool_larsrc/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_larsrc/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -1,37 +1,37 @@
-<% 
-/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
- 
- /**
-  * ImgButtonWrapper.tag
-  *	Author: Mitchell Seaton
-  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
-  */
- 
- %>
-<%@ tag body-content="scriptless" %>
-<div id="button-table" class="space-bottom-top">
-	<div id="button-row">
-		<jsp:doBody />
-	</div>
-</div>
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * ImgButtonWrapper.tag
+  *	Author: Mitchell Seaton
+  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
+  */
+ 
+ %>
+<%@ tag body-content="scriptless" %>
+<div id="button-table" class="space-bottom-top">
+	<div id="button-row">
+		<jsp:doBody />
+	</div>
+</div>
Index: lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r24ebb6c91f49a10f1e5718036b3a3c1a80c3314f -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 24ebb6c91f49a10f1e5718036b3a3c1a80c3314f)
+++ lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -344,6 +344,10 @@
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
 	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
Index: lams_tool_leader/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u
--- lams_tool_leader/web/WEB-INF/tags/Etherpad.tag	(revision 0)
+++ lams_tool_leader/web/WEB-INF/tags/Etherpad.tag	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -0,0 +1,98 @@
+<% 
+ /**
+  * Etherpad.tag
+  *	Author: Marcin Cieslak
+  *	Description: Etherpad pad
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+
+<%@ attribute name="groupId" required="true" rtexprvalue="true" %>
+<%@ attribute name="showControls" required="false" rtexprvalue="true" %>
+<%@ attribute name="showChat" required="false" rtexprvalue="true" %>
+<%@ attribute name="height" required="false" rtexprvalue="true" %>
+<%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
+<c:set var="etherpadServerUrl"><%=Configuration.get(ConfigurationKeys.ETHERPAD_SERVER_URL)%></c:set>
+<c:set var="localeLanguage"><lams:user property="localeLanguage" /></c:set>
+<jsp:doBody var="content" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.etherpad-initial-content {
+		display: none;
+	}
+</style>
+
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
+<script type="text/javascript">
+	$(document).ready(function(){
+		// 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;
+		
+		<c:if test="${heightAutoGrow eq 'true'}">
+			// 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:if>
+		
+		window.setTimeout(function(){
+			$.ajax({
+				url: '<lams:LAMSURL/>etherpad/getPad.do',
+				cache : false,
+				type: "GET",
+				data: {
+					groupId : '${groupId}',
+					content : $('#etherpad-initial-content-${groupId}').html()
+				},
+				dataType : 'text',
+				success: function(padId, status, xhr) {
+					lamsEtherpadTagInitialising = false;
+					if ( status == "error" ) {
+						console.log( xhr.status + " " + xhr.statusText );
+					} else {
+						// proper initialisation
+						$('#etherpad-container-${groupId}').pad({
+							'padId': padId,
+							'host':'${etherpadServerUrl}',
+							'lang':'${fn:toLowerCase(localeLanguage)}',
+							'showControls':${empty showControls ? false : showControls},
+							'showChat': ${empty showChat ? false : showChat},
+							'height': ${empty height ? 'undefined' : height}
+							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+						});
+					}
+				}
+			});
+			// wait for other pad on the page to initialise
+		}, delayBeforeInitialise);
+	});
+</script>
+
+<div class="etherpad-container" id='etherpad-container-${groupId}'></div>
+
+<%-- If content was provided, put it into a hidden div so new lines will not break JavaScript --%>
+<c:if test="${not empty content.trim()}">
+	<span class="etherpad-initial-content" id="etherpad-initial-content-${groupId}">
+		${content}
+	</span>
+</c:if>
\ No newline at end of file
Index: lams_tool_leader/web/WEB-INF/tags/ImgButtonWrapper.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_tool_leader/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_leader/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -1,37 +1,37 @@
-<% 
-/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
- 
- /**
-  * ImgButtonWrapper.tag
-  *	Author: Mitchell Seaton
-  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
-  */
- 
- %>
-<%@ tag body-content="scriptless" %>
-<div id="button-table" class="space-bottom-top">
-	<div id="button-row">
-		<jsp:doBody />
-	</div>
-</div>
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * ImgButtonWrapper.tag
+  *	Author: Mitchell Seaton
+  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
+  */
+ 
+ %>
+<%@ tag body-content="scriptless" %>
+<div id="button-table" class="space-bottom-top">
+	<div id="button-row">
+		<jsp:doBody />
+	</div>
+</div>
Index: lams_tool_leader/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r24ebb6c91f49a10f1e5718036b3a3c1a80c3314f -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_tool_leader/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 24ebb6c91f49a10f1e5718036b3a3c1a80c3314f)
+++ lams_tool_leader/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -344,6 +344,10 @@
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
 	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
Index: lams_tool_mindmap/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u
--- lams_tool_mindmap/web/WEB-INF/tags/Etherpad.tag	(revision 0)
+++ lams_tool_mindmap/web/WEB-INF/tags/Etherpad.tag	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -0,0 +1,98 @@
+<% 
+ /**
+  * Etherpad.tag
+  *	Author: Marcin Cieslak
+  *	Description: Etherpad pad
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+
+<%@ attribute name="groupId" required="true" rtexprvalue="true" %>
+<%@ attribute name="showControls" required="false" rtexprvalue="true" %>
+<%@ attribute name="showChat" required="false" rtexprvalue="true" %>
+<%@ attribute name="height" required="false" rtexprvalue="true" %>
+<%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
+<c:set var="etherpadServerUrl"><%=Configuration.get(ConfigurationKeys.ETHERPAD_SERVER_URL)%></c:set>
+<c:set var="localeLanguage"><lams:user property="localeLanguage" /></c:set>
+<jsp:doBody var="content" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.etherpad-initial-content {
+		display: none;
+	}
+</style>
+
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
+<script type="text/javascript">
+	$(document).ready(function(){
+		// 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;
+		
+		<c:if test="${heightAutoGrow eq 'true'}">
+			// 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:if>
+		
+		window.setTimeout(function(){
+			$.ajax({
+				url: '<lams:LAMSURL/>etherpad/getPad.do',
+				cache : false,
+				type: "GET",
+				data: {
+					groupId : '${groupId}',
+					content : $('#etherpad-initial-content-${groupId}').html()
+				},
+				dataType : 'text',
+				success: function(padId, status, xhr) {
+					lamsEtherpadTagInitialising = false;
+					if ( status == "error" ) {
+						console.log( xhr.status + " " + xhr.statusText );
+					} else {
+						// proper initialisation
+						$('#etherpad-container-${groupId}').pad({
+							'padId': padId,
+							'host':'${etherpadServerUrl}',
+							'lang':'${fn:toLowerCase(localeLanguage)}',
+							'showControls':${empty showControls ? false : showControls},
+							'showChat': ${empty showChat ? false : showChat},
+							'height': ${empty height ? 'undefined' : height}
+							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+						});
+					}
+				}
+			});
+			// wait for other pad on the page to initialise
+		}, delayBeforeInitialise);
+	});
+</script>
+
+<div class="etherpad-container" id='etherpad-container-${groupId}'></div>
+
+<%-- If content was provided, put it into a hidden div so new lines will not break JavaScript --%>
+<c:if test="${not empty content.trim()}">
+	<span class="etherpad-initial-content" id="etherpad-initial-content-${groupId}">
+		${content}
+	</span>
+</c:if>
\ No newline at end of file
Index: lams_tool_mindmap/web/WEB-INF/tags/ImgButtonWrapper.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_tool_mindmap/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_mindmap/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -1,37 +1,37 @@
-<% 
-/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
- 
- /**
-  * ImgButtonWrapper.tag
-  *	Author: Mitchell Seaton
-  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
-  */
- 
- %>
-<%@ tag body-content="scriptless" %>
-<div id="button-table" class="space-bottom-top">
-	<div id="button-row">
-		<jsp:doBody />
-	</div>
-</div>
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * ImgButtonWrapper.tag
+  *	Author: Mitchell Seaton
+  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
+  */
+ 
+ %>
+<%@ tag body-content="scriptless" %>
+<div id="button-table" class="space-bottom-top">
+	<div id="button-row">
+		<jsp:doBody />
+	</div>
+</div>
Index: lams_tool_mindmap/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r24ebb6c91f49a10f1e5718036b3a3c1a80c3314f -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_tool_mindmap/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 24ebb6c91f49a10f1e5718036b3a3c1a80c3314f)
+++ lams_tool_mindmap/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -344,6 +344,10 @@
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
 	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
Index: lams_tool_nb/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u
--- lams_tool_nb/web/WEB-INF/tags/Etherpad.tag	(revision 0)
+++ lams_tool_nb/web/WEB-INF/tags/Etherpad.tag	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -0,0 +1,98 @@
+<% 
+ /**
+  * Etherpad.tag
+  *	Author: Marcin Cieslak
+  *	Description: Etherpad pad
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+
+<%@ attribute name="groupId" required="true" rtexprvalue="true" %>
+<%@ attribute name="showControls" required="false" rtexprvalue="true" %>
+<%@ attribute name="showChat" required="false" rtexprvalue="true" %>
+<%@ attribute name="height" required="false" rtexprvalue="true" %>
+<%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
+<c:set var="etherpadServerUrl"><%=Configuration.get(ConfigurationKeys.ETHERPAD_SERVER_URL)%></c:set>
+<c:set var="localeLanguage"><lams:user property="localeLanguage" /></c:set>
+<jsp:doBody var="content" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.etherpad-initial-content {
+		display: none;
+	}
+</style>
+
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
+<script type="text/javascript">
+	$(document).ready(function(){
+		// 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;
+		
+		<c:if test="${heightAutoGrow eq 'true'}">
+			// 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:if>
+		
+		window.setTimeout(function(){
+			$.ajax({
+				url: '<lams:LAMSURL/>etherpad/getPad.do',
+				cache : false,
+				type: "GET",
+				data: {
+					groupId : '${groupId}',
+					content : $('#etherpad-initial-content-${groupId}').html()
+				},
+				dataType : 'text',
+				success: function(padId, status, xhr) {
+					lamsEtherpadTagInitialising = false;
+					if ( status == "error" ) {
+						console.log( xhr.status + " " + xhr.statusText );
+					} else {
+						// proper initialisation
+						$('#etherpad-container-${groupId}').pad({
+							'padId': padId,
+							'host':'${etherpadServerUrl}',
+							'lang':'${fn:toLowerCase(localeLanguage)}',
+							'showControls':${empty showControls ? false : showControls},
+							'showChat': ${empty showChat ? false : showChat},
+							'height': ${empty height ? 'undefined' : height}
+							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+						});
+					}
+				}
+			});
+			// wait for other pad on the page to initialise
+		}, delayBeforeInitialise);
+	});
+</script>
+
+<div class="etherpad-container" id='etherpad-container-${groupId}'></div>
+
+<%-- If content was provided, put it into a hidden div so new lines will not break JavaScript --%>
+<c:if test="${not empty content.trim()}">
+	<span class="etherpad-initial-content" id="etherpad-initial-content-${groupId}">
+		${content}
+	</span>
+</c:if>
\ No newline at end of file
Index: lams_tool_nb/web/WEB-INF/tags/ImgButtonWrapper.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_tool_nb/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_nb/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -1,37 +1,37 @@
-<% 
-/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
- 
- /**
-  * ImgButtonWrapper.tag
-  *	Author: Mitchell Seaton
-  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
-  */
- 
- %>
-<%@ tag body-content="scriptless" %>
-<div id="button-table" class="space-bottom-top">
-	<div id="button-row">
-		<jsp:doBody />
-	</div>
-</div>
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * ImgButtonWrapper.tag
+  *	Author: Mitchell Seaton
+  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
+  */
+ 
+ %>
+<%@ tag body-content="scriptless" %>
+<div id="button-table" class="space-bottom-top">
+	<div id="button-row">
+		<jsp:doBody />
+	</div>
+</div>
Index: lams_tool_nb/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r24ebb6c91f49a10f1e5718036b3a3c1a80c3314f -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_tool_nb/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 24ebb6c91f49a10f1e5718036b3a3c1a80c3314f)
+++ lams_tool_nb/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -344,6 +344,10 @@
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
 	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
Index: lams_tool_notebook/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u
--- lams_tool_notebook/web/WEB-INF/tags/Etherpad.tag	(revision 0)
+++ lams_tool_notebook/web/WEB-INF/tags/Etherpad.tag	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -0,0 +1,98 @@
+<% 
+ /**
+  * Etherpad.tag
+  *	Author: Marcin Cieslak
+  *	Description: Etherpad pad
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+
+<%@ attribute name="groupId" required="true" rtexprvalue="true" %>
+<%@ attribute name="showControls" required="false" rtexprvalue="true" %>
+<%@ attribute name="showChat" required="false" rtexprvalue="true" %>
+<%@ attribute name="height" required="false" rtexprvalue="true" %>
+<%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
+<c:set var="etherpadServerUrl"><%=Configuration.get(ConfigurationKeys.ETHERPAD_SERVER_URL)%></c:set>
+<c:set var="localeLanguage"><lams:user property="localeLanguage" /></c:set>
+<jsp:doBody var="content" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.etherpad-initial-content {
+		display: none;
+	}
+</style>
+
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
+<script type="text/javascript">
+	$(document).ready(function(){
+		// 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;
+		
+		<c:if test="${heightAutoGrow eq 'true'}">
+			// 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:if>
+		
+		window.setTimeout(function(){
+			$.ajax({
+				url: '<lams:LAMSURL/>etherpad/getPad.do',
+				cache : false,
+				type: "GET",
+				data: {
+					groupId : '${groupId}',
+					content : $('#etherpad-initial-content-${groupId}').html()
+				},
+				dataType : 'text',
+				success: function(padId, status, xhr) {
+					lamsEtherpadTagInitialising = false;
+					if ( status == "error" ) {
+						console.log( xhr.status + " " + xhr.statusText );
+					} else {
+						// proper initialisation
+						$('#etherpad-container-${groupId}').pad({
+							'padId': padId,
+							'host':'${etherpadServerUrl}',
+							'lang':'${fn:toLowerCase(localeLanguage)}',
+							'showControls':${empty showControls ? false : showControls},
+							'showChat': ${empty showChat ? false : showChat},
+							'height': ${empty height ? 'undefined' : height}
+							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+						});
+					}
+				}
+			});
+			// wait for other pad on the page to initialise
+		}, delayBeforeInitialise);
+	});
+</script>
+
+<div class="etherpad-container" id='etherpad-container-${groupId}'></div>
+
+<%-- If content was provided, put it into a hidden div so new lines will not break JavaScript --%>
+<c:if test="${not empty content.trim()}">
+	<span class="etherpad-initial-content" id="etherpad-initial-content-${groupId}">
+		${content}
+	</span>
+</c:if>
\ No newline at end of file
Index: lams_tool_notebook/web/WEB-INF/tags/ImgButtonWrapper.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_tool_notebook/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_notebook/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -1,37 +1,37 @@
-<% 
-/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
- 
- /**
-  * ImgButtonWrapper.tag
-  *	Author: Mitchell Seaton
-  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
-  */
- 
- %>
-<%@ tag body-content="scriptless" %>
-<div id="button-table" class="space-bottom-top">
-	<div id="button-row">
-		<jsp:doBody />
-	</div>
-</div>
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * ImgButtonWrapper.tag
+  *	Author: Mitchell Seaton
+  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
+  */
+ 
+ %>
+<%@ tag body-content="scriptless" %>
+<div id="button-table" class="space-bottom-top">
+	<div id="button-row">
+		<jsp:doBody />
+	</div>
+</div>
Index: lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r24ebb6c91f49a10f1e5718036b3a3c1a80c3314f -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 24ebb6c91f49a10f1e5718036b3a3c1a80c3314f)
+++ lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -344,6 +344,10 @@
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
 	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
Index: lams_tool_pixlr/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u
--- lams_tool_pixlr/web/WEB-INF/tags/Etherpad.tag	(revision 0)
+++ lams_tool_pixlr/web/WEB-INF/tags/Etherpad.tag	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -0,0 +1,98 @@
+<% 
+ /**
+  * Etherpad.tag
+  *	Author: Marcin Cieslak
+  *	Description: Etherpad pad
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+
+<%@ attribute name="groupId" required="true" rtexprvalue="true" %>
+<%@ attribute name="showControls" required="false" rtexprvalue="true" %>
+<%@ attribute name="showChat" required="false" rtexprvalue="true" %>
+<%@ attribute name="height" required="false" rtexprvalue="true" %>
+<%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
+<c:set var="etherpadServerUrl"><%=Configuration.get(ConfigurationKeys.ETHERPAD_SERVER_URL)%></c:set>
+<c:set var="localeLanguage"><lams:user property="localeLanguage" /></c:set>
+<jsp:doBody var="content" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.etherpad-initial-content {
+		display: none;
+	}
+</style>
+
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
+<script type="text/javascript">
+	$(document).ready(function(){
+		// 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;
+		
+		<c:if test="${heightAutoGrow eq 'true'}">
+			// 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:if>
+		
+		window.setTimeout(function(){
+			$.ajax({
+				url: '<lams:LAMSURL/>etherpad/getPad.do',
+				cache : false,
+				type: "GET",
+				data: {
+					groupId : '${groupId}',
+					content : $('#etherpad-initial-content-${groupId}').html()
+				},
+				dataType : 'text',
+				success: function(padId, status, xhr) {
+					lamsEtherpadTagInitialising = false;
+					if ( status == "error" ) {
+						console.log( xhr.status + " " + xhr.statusText );
+					} else {
+						// proper initialisation
+						$('#etherpad-container-${groupId}').pad({
+							'padId': padId,
+							'host':'${etherpadServerUrl}',
+							'lang':'${fn:toLowerCase(localeLanguage)}',
+							'showControls':${empty showControls ? false : showControls},
+							'showChat': ${empty showChat ? false : showChat},
+							'height': ${empty height ? 'undefined' : height}
+							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+						});
+					}
+				}
+			});
+			// wait for other pad on the page to initialise
+		}, delayBeforeInitialise);
+	});
+</script>
+
+<div class="etherpad-container" id='etherpad-container-${groupId}'></div>
+
+<%-- If content was provided, put it into a hidden div so new lines will not break JavaScript --%>
+<c:if test="${not empty content.trim()}">
+	<span class="etherpad-initial-content" id="etherpad-initial-content-${groupId}">
+		${content}
+	</span>
+</c:if>
\ No newline at end of file
Index: lams_tool_pixlr/web/WEB-INF/tags/ImgButtonWrapper.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_tool_pixlr/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_pixlr/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -1,37 +1,37 @@
-<% 
-/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
- 
- /**
-  * ImgButtonWrapper.tag
-  *	Author: Mitchell Seaton
-  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
-  */
- 
- %>
-<%@ tag body-content="scriptless" %>
-<div id="button-table" class="space-bottom-top">
-	<div id="button-row">
-		<jsp:doBody />
-	</div>
-</div>
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * ImgButtonWrapper.tag
+  *	Author: Mitchell Seaton
+  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
+  */
+ 
+ %>
+<%@ tag body-content="scriptless" %>
+<div id="button-table" class="space-bottom-top">
+	<div id="button-row">
+		<jsp:doBody />
+	</div>
+</div>
Index: lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r24ebb6c91f49a10f1e5718036b3a3c1a80c3314f -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 24ebb6c91f49a10f1e5718036b3a3c1a80c3314f)
+++ lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -344,6 +344,10 @@
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
 	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
Index: lams_tool_preview/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u
--- lams_tool_preview/web/WEB-INF/tags/Etherpad.tag	(revision 0)
+++ lams_tool_preview/web/WEB-INF/tags/Etherpad.tag	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -0,0 +1,98 @@
+<% 
+ /**
+  * Etherpad.tag
+  *	Author: Marcin Cieslak
+  *	Description: Etherpad pad
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+
+<%@ attribute name="groupId" required="true" rtexprvalue="true" %>
+<%@ attribute name="showControls" required="false" rtexprvalue="true" %>
+<%@ attribute name="showChat" required="false" rtexprvalue="true" %>
+<%@ attribute name="height" required="false" rtexprvalue="true" %>
+<%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
+<c:set var="etherpadServerUrl"><%=Configuration.get(ConfigurationKeys.ETHERPAD_SERVER_URL)%></c:set>
+<c:set var="localeLanguage"><lams:user property="localeLanguage" /></c:set>
+<jsp:doBody var="content" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.etherpad-initial-content {
+		display: none;
+	}
+</style>
+
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
+<script type="text/javascript">
+	$(document).ready(function(){
+		// 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;
+		
+		<c:if test="${heightAutoGrow eq 'true'}">
+			// 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:if>
+		
+		window.setTimeout(function(){
+			$.ajax({
+				url: '<lams:LAMSURL/>etherpad/getPad.do',
+				cache : false,
+				type: "GET",
+				data: {
+					groupId : '${groupId}',
+					content : $('#etherpad-initial-content-${groupId}').html()
+				},
+				dataType : 'text',
+				success: function(padId, status, xhr) {
+					lamsEtherpadTagInitialising = false;
+					if ( status == "error" ) {
+						console.log( xhr.status + " " + xhr.statusText );
+					} else {
+						// proper initialisation
+						$('#etherpad-container-${groupId}').pad({
+							'padId': padId,
+							'host':'${etherpadServerUrl}',
+							'lang':'${fn:toLowerCase(localeLanguage)}',
+							'showControls':${empty showControls ? false : showControls},
+							'showChat': ${empty showChat ? false : showChat},
+							'height': ${empty height ? 'undefined' : height}
+							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+						});
+					}
+				}
+			});
+			// wait for other pad on the page to initialise
+		}, delayBeforeInitialise);
+	});
+</script>
+
+<div class="etherpad-container" id='etherpad-container-${groupId}'></div>
+
+<%-- If content was provided, put it into a hidden div so new lines will not break JavaScript --%>
+<c:if test="${not empty content.trim()}">
+	<span class="etherpad-initial-content" id="etherpad-initial-content-${groupId}">
+		${content}
+	</span>
+</c:if>
\ No newline at end of file
Index: lams_tool_preview/web/WEB-INF/tags/ImgButtonWrapper.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_tool_preview/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_preview/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -1,37 +1,37 @@
-<% 
-/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
- 
- /**
-  * ImgButtonWrapper.tag
-  *	Author: Mitchell Seaton
-  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
-  */
- 
- %>
-<%@ tag body-content="scriptless" %>
-<div id="button-table" class="space-bottom-top">
-	<div id="button-row">
-		<jsp:doBody />
-	</div>
-</div>
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * ImgButtonWrapper.tag
+  *	Author: Mitchell Seaton
+  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
+  */
+ 
+ %>
+<%@ tag body-content="scriptless" %>
+<div id="button-table" class="space-bottom-top">
+	<div id="button-row">
+		<jsp:doBody />
+	</div>
+</div>
Index: lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r24ebb6c91f49a10f1e5718036b3a3c1a80c3314f -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 24ebb6c91f49a10f1e5718036b3a3c1a80c3314f)
+++ lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -344,6 +344,10 @@
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
 	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
Index: lams_tool_sbmt/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u
--- lams_tool_sbmt/web/WEB-INF/tags/Etherpad.tag	(revision 0)
+++ lams_tool_sbmt/web/WEB-INF/tags/Etherpad.tag	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -0,0 +1,98 @@
+<% 
+ /**
+  * Etherpad.tag
+  *	Author: Marcin Cieslak
+  *	Description: Etherpad pad
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+
+<%@ attribute name="groupId" required="true" rtexprvalue="true" %>
+<%@ attribute name="showControls" required="false" rtexprvalue="true" %>
+<%@ attribute name="showChat" required="false" rtexprvalue="true" %>
+<%@ attribute name="height" required="false" rtexprvalue="true" %>
+<%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
+<c:set var="etherpadServerUrl"><%=Configuration.get(ConfigurationKeys.ETHERPAD_SERVER_URL)%></c:set>
+<c:set var="localeLanguage"><lams:user property="localeLanguage" /></c:set>
+<jsp:doBody var="content" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.etherpad-initial-content {
+		display: none;
+	}
+</style>
+
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
+<script type="text/javascript">
+	$(document).ready(function(){
+		// 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;
+		
+		<c:if test="${heightAutoGrow eq 'true'}">
+			// 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:if>
+		
+		window.setTimeout(function(){
+			$.ajax({
+				url: '<lams:LAMSURL/>etherpad/getPad.do',
+				cache : false,
+				type: "GET",
+				data: {
+					groupId : '${groupId}',
+					content : $('#etherpad-initial-content-${groupId}').html()
+				},
+				dataType : 'text',
+				success: function(padId, status, xhr) {
+					lamsEtherpadTagInitialising = false;
+					if ( status == "error" ) {
+						console.log( xhr.status + " " + xhr.statusText );
+					} else {
+						// proper initialisation
+						$('#etherpad-container-${groupId}').pad({
+							'padId': padId,
+							'host':'${etherpadServerUrl}',
+							'lang':'${fn:toLowerCase(localeLanguage)}',
+							'showControls':${empty showControls ? false : showControls},
+							'showChat': ${empty showChat ? false : showChat},
+							'height': ${empty height ? 'undefined' : height}
+							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+						});
+					}
+				}
+			});
+			// wait for other pad on the page to initialise
+		}, delayBeforeInitialise);
+	});
+</script>
+
+<div class="etherpad-container" id='etherpad-container-${groupId}'></div>
+
+<%-- If content was provided, put it into a hidden div so new lines will not break JavaScript --%>
+<c:if test="${not empty content.trim()}">
+	<span class="etherpad-initial-content" id="etherpad-initial-content-${groupId}">
+		${content}
+	</span>
+</c:if>
\ No newline at end of file
Index: lams_tool_sbmt/web/WEB-INF/tags/ImgButtonWrapper.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_tool_sbmt/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_sbmt/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -1,37 +1,37 @@
-<% 
-/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
- 
- /**
-  * ImgButtonWrapper.tag
-  *	Author: Mitchell Seaton
-  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
-  */
- 
- %>
-<%@ tag body-content="scriptless" %>
-<div id="button-table" class="space-bottom-top">
-	<div id="button-row">
-		<jsp:doBody />
-	</div>
-</div>
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * ImgButtonWrapper.tag
+  *	Author: Mitchell Seaton
+  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
+  */
+ 
+ %>
+<%@ tag body-content="scriptless" %>
+<div id="button-table" class="space-bottom-top">
+	<div id="button-row">
+		<jsp:doBody />
+	</div>
+</div>
Index: lams_tool_sbmt/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r24ebb6c91f49a10f1e5718036b3a3c1a80c3314f -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_tool_sbmt/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 24ebb6c91f49a10f1e5718036b3a3c1a80c3314f)
+++ lams_tool_sbmt/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -344,6 +344,10 @@
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
 	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
Index: lams_tool_scratchie/web/WEB-INF/tags/ImgButtonWrapper.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_tool_scratchie/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_scratchie/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -1,37 +1,37 @@
-<% 
-/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
- 
- /**
-  * ImgButtonWrapper.tag
-  *	Author: Mitchell Seaton
-  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
-  */
- 
- %>
-<%@ tag body-content="scriptless" %>
-<div id="button-table" class="space-bottom-top">
-	<div id="button-row">
-		<jsp:doBody />
-	</div>
-</div>
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * ImgButtonWrapper.tag
+  *	Author: Mitchell Seaton
+  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
+  */
+ 
+ %>
+<%@ tag body-content="scriptless" %>
+<div id="button-table" class="space-bottom-top">
+	<div id="button-row">
+		<jsp:doBody />
+	</div>
+</div>
Index: lams_tool_scribe/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u
--- lams_tool_scribe/web/WEB-INF/tags/Etherpad.tag	(revision 0)
+++ lams_tool_scribe/web/WEB-INF/tags/Etherpad.tag	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -0,0 +1,98 @@
+<% 
+ /**
+  * Etherpad.tag
+  *	Author: Marcin Cieslak
+  *	Description: Etherpad pad
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+
+<%@ attribute name="groupId" required="true" rtexprvalue="true" %>
+<%@ attribute name="showControls" required="false" rtexprvalue="true" %>
+<%@ attribute name="showChat" required="false" rtexprvalue="true" %>
+<%@ attribute name="height" required="false" rtexprvalue="true" %>
+<%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
+<c:set var="etherpadServerUrl"><%=Configuration.get(ConfigurationKeys.ETHERPAD_SERVER_URL)%></c:set>
+<c:set var="localeLanguage"><lams:user property="localeLanguage" /></c:set>
+<jsp:doBody var="content" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.etherpad-initial-content {
+		display: none;
+	}
+</style>
+
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
+<script type="text/javascript">
+	$(document).ready(function(){
+		// 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;
+		
+		<c:if test="${heightAutoGrow eq 'true'}">
+			// 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:if>
+		
+		window.setTimeout(function(){
+			$.ajax({
+				url: '<lams:LAMSURL/>etherpad/getPad.do',
+				cache : false,
+				type: "GET",
+				data: {
+					groupId : '${groupId}',
+					content : $('#etherpad-initial-content-${groupId}').html()
+				},
+				dataType : 'text',
+				success: function(padId, status, xhr) {
+					lamsEtherpadTagInitialising = false;
+					if ( status == "error" ) {
+						console.log( xhr.status + " " + xhr.statusText );
+					} else {
+						// proper initialisation
+						$('#etherpad-container-${groupId}').pad({
+							'padId': padId,
+							'host':'${etherpadServerUrl}',
+							'lang':'${fn:toLowerCase(localeLanguage)}',
+							'showControls':${empty showControls ? false : showControls},
+							'showChat': ${empty showChat ? false : showChat},
+							'height': ${empty height ? 'undefined' : height}
+							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+						});
+					}
+				}
+			});
+			// wait for other pad on the page to initialise
+		}, delayBeforeInitialise);
+	});
+</script>
+
+<div class="etherpad-container" id='etherpad-container-${groupId}'></div>
+
+<%-- If content was provided, put it into a hidden div so new lines will not break JavaScript --%>
+<c:if test="${not empty content.trim()}">
+	<span class="etherpad-initial-content" id="etherpad-initial-content-${groupId}">
+		${content}
+	</span>
+</c:if>
\ No newline at end of file
Index: lams_tool_scribe/web/WEB-INF/tags/ImgButtonWrapper.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_tool_scribe/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_scribe/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -1,37 +1,37 @@
-<% 
-/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
- 
- /**
-  * ImgButtonWrapper.tag
-  *	Author: Mitchell Seaton
-  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
-  */
- 
- %>
-<%@ tag body-content="scriptless" %>
-<div id="button-table" class="space-bottom-top">
-	<div id="button-row">
-		<jsp:doBody />
-	</div>
-</div>
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * ImgButtonWrapper.tag
+  *	Author: Mitchell Seaton
+  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
+  */
+ 
+ %>
+<%@ tag body-content="scriptless" %>
+<div id="button-table" class="space-bottom-top">
+	<div id="button-row">
+		<jsp:doBody />
+	</div>
+</div>
Index: lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r24ebb6c91f49a10f1e5718036b3a3c1a80c3314f -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 24ebb6c91f49a10f1e5718036b3a3c1a80c3314f)
+++ lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -344,6 +344,10 @@
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
 	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
Index: lams_tool_spreadsheet/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u
--- lams_tool_spreadsheet/web/WEB-INF/tags/Etherpad.tag	(revision 0)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/Etherpad.tag	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -0,0 +1,98 @@
+<% 
+ /**
+  * Etherpad.tag
+  *	Author: Marcin Cieslak
+  *	Description: Etherpad pad
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+
+<%@ attribute name="groupId" required="true" rtexprvalue="true" %>
+<%@ attribute name="showControls" required="false" rtexprvalue="true" %>
+<%@ attribute name="showChat" required="false" rtexprvalue="true" %>
+<%@ attribute name="height" required="false" rtexprvalue="true" %>
+<%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
+<c:set var="etherpadServerUrl"><%=Configuration.get(ConfigurationKeys.ETHERPAD_SERVER_URL)%></c:set>
+<c:set var="localeLanguage"><lams:user property="localeLanguage" /></c:set>
+<jsp:doBody var="content" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.etherpad-initial-content {
+		display: none;
+	}
+</style>
+
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
+<script type="text/javascript">
+	$(document).ready(function(){
+		// 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;
+		
+		<c:if test="${heightAutoGrow eq 'true'}">
+			// 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:if>
+		
+		window.setTimeout(function(){
+			$.ajax({
+				url: '<lams:LAMSURL/>etherpad/getPad.do',
+				cache : false,
+				type: "GET",
+				data: {
+					groupId : '${groupId}',
+					content : $('#etherpad-initial-content-${groupId}').html()
+				},
+				dataType : 'text',
+				success: function(padId, status, xhr) {
+					lamsEtherpadTagInitialising = false;
+					if ( status == "error" ) {
+						console.log( xhr.status + " " + xhr.statusText );
+					} else {
+						// proper initialisation
+						$('#etherpad-container-${groupId}').pad({
+							'padId': padId,
+							'host':'${etherpadServerUrl}',
+							'lang':'${fn:toLowerCase(localeLanguage)}',
+							'showControls':${empty showControls ? false : showControls},
+							'showChat': ${empty showChat ? false : showChat},
+							'height': ${empty height ? 'undefined' : height}
+							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+						});
+					}
+				}
+			});
+			// wait for other pad on the page to initialise
+		}, delayBeforeInitialise);
+	});
+</script>
+
+<div class="etherpad-container" id='etherpad-container-${groupId}'></div>
+
+<%-- If content was provided, put it into a hidden div so new lines will not break JavaScript --%>
+<c:if test="${not empty content.trim()}">
+	<span class="etherpad-initial-content" id="etherpad-initial-content-${groupId}">
+		${content}
+	</span>
+</c:if>
\ No newline at end of file
Index: lams_tool_spreadsheet/web/WEB-INF/tags/ImgButtonWrapper.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_tool_spreadsheet/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -1,37 +1,37 @@
-<% 
-/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
- 
- /**
-  * ImgButtonWrapper.tag
-  *	Author: Mitchell Seaton
-  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
-  */
- 
- %>
-<%@ tag body-content="scriptless" %>
-<div id="button-table" class="space-bottom-top">
-	<div id="button-row">
-		<jsp:doBody />
-	</div>
-</div>
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * ImgButtonWrapper.tag
+  *	Author: Mitchell Seaton
+  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
+  */
+ 
+ %>
+<%@ tag body-content="scriptless" %>
+<div id="button-table" class="space-bottom-top">
+	<div id="button-row">
+		<jsp:doBody />
+	</div>
+</div>
Index: lams_tool_spreadsheet/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r24ebb6c91f49a10f1e5718036b3a3c1a80c3314f -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_tool_spreadsheet/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 24ebb6c91f49a10f1e5718036b3a3c1a80c3314f)
+++ lams_tool_spreadsheet/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -344,6 +344,10 @@
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
 	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
Index: lams_tool_survey/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u
--- lams_tool_survey/web/WEB-INF/tags/Etherpad.tag	(revision 0)
+++ lams_tool_survey/web/WEB-INF/tags/Etherpad.tag	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -0,0 +1,98 @@
+<% 
+ /**
+  * Etherpad.tag
+  *	Author: Marcin Cieslak
+  *	Description: Etherpad pad
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+
+<%@ attribute name="groupId" required="true" rtexprvalue="true" %>
+<%@ attribute name="showControls" required="false" rtexprvalue="true" %>
+<%@ attribute name="showChat" required="false" rtexprvalue="true" %>
+<%@ attribute name="height" required="false" rtexprvalue="true" %>
+<%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
+<c:set var="etherpadServerUrl"><%=Configuration.get(ConfigurationKeys.ETHERPAD_SERVER_URL)%></c:set>
+<c:set var="localeLanguage"><lams:user property="localeLanguage" /></c:set>
+<jsp:doBody var="content" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.etherpad-initial-content {
+		display: none;
+	}
+</style>
+
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
+<script type="text/javascript">
+	$(document).ready(function(){
+		// 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;
+		
+		<c:if test="${heightAutoGrow eq 'true'}">
+			// 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:if>
+		
+		window.setTimeout(function(){
+			$.ajax({
+				url: '<lams:LAMSURL/>etherpad/getPad.do',
+				cache : false,
+				type: "GET",
+				data: {
+					groupId : '${groupId}',
+					content : $('#etherpad-initial-content-${groupId}').html()
+				},
+				dataType : 'text',
+				success: function(padId, status, xhr) {
+					lamsEtherpadTagInitialising = false;
+					if ( status == "error" ) {
+						console.log( xhr.status + " " + xhr.statusText );
+					} else {
+						// proper initialisation
+						$('#etherpad-container-${groupId}').pad({
+							'padId': padId,
+							'host':'${etherpadServerUrl}',
+							'lang':'${fn:toLowerCase(localeLanguage)}',
+							'showControls':${empty showControls ? false : showControls},
+							'showChat': ${empty showChat ? false : showChat},
+							'height': ${empty height ? 'undefined' : height}
+							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+						});
+					}
+				}
+			});
+			// wait for other pad on the page to initialise
+		}, delayBeforeInitialise);
+	});
+</script>
+
+<div class="etherpad-container" id='etherpad-container-${groupId}'></div>
+
+<%-- If content was provided, put it into a hidden div so new lines will not break JavaScript --%>
+<c:if test="${not empty content.trim()}">
+	<span class="etherpad-initial-content" id="etherpad-initial-content-${groupId}">
+		${content}
+	</span>
+</c:if>
\ No newline at end of file
Index: lams_tool_survey/web/WEB-INF/tags/ImgButtonWrapper.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_tool_survey/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_survey/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -1,37 +1,37 @@
-<% 
-/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
- 
- /**
-  * ImgButtonWrapper.tag
-  *	Author: Mitchell Seaton
-  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
-  */
- 
- %>
-<%@ tag body-content="scriptless" %>
-<div id="button-table" class="space-bottom-top">
-	<div id="button-row">
-		<jsp:doBody />
-	</div>
-</div>
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * ImgButtonWrapper.tag
+  *	Author: Mitchell Seaton
+  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
+  */
+ 
+ %>
+<%@ tag body-content="scriptless" %>
+<div id="button-table" class="space-bottom-top">
+	<div id="button-row">
+		<jsp:doBody />
+	</div>
+</div>
Index: lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r24ebb6c91f49a10f1e5718036b3a3c1a80c3314f -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 24ebb6c91f49a10f1e5718036b3a3c1a80c3314f)
+++ lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -344,6 +344,10 @@
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
 	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
Index: lams_tool_task/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u
--- lams_tool_task/web/WEB-INF/tags/Etherpad.tag	(revision 0)
+++ lams_tool_task/web/WEB-INF/tags/Etherpad.tag	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -0,0 +1,98 @@
+<% 
+ /**
+  * Etherpad.tag
+  *	Author: Marcin Cieslak
+  *	Description: Etherpad pad
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+
+<%@ attribute name="groupId" required="true" rtexprvalue="true" %>
+<%@ attribute name="showControls" required="false" rtexprvalue="true" %>
+<%@ attribute name="showChat" required="false" rtexprvalue="true" %>
+<%@ attribute name="height" required="false" rtexprvalue="true" %>
+<%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
+<c:set var="etherpadServerUrl"><%=Configuration.get(ConfigurationKeys.ETHERPAD_SERVER_URL)%></c:set>
+<c:set var="localeLanguage"><lams:user property="localeLanguage" /></c:set>
+<jsp:doBody var="content" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.etherpad-initial-content {
+		display: none;
+	}
+</style>
+
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
+<script type="text/javascript">
+	$(document).ready(function(){
+		// 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;
+		
+		<c:if test="${heightAutoGrow eq 'true'}">
+			// 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:if>
+		
+		window.setTimeout(function(){
+			$.ajax({
+				url: '<lams:LAMSURL/>etherpad/getPad.do',
+				cache : false,
+				type: "GET",
+				data: {
+					groupId : '${groupId}',
+					content : $('#etherpad-initial-content-${groupId}').html()
+				},
+				dataType : 'text',
+				success: function(padId, status, xhr) {
+					lamsEtherpadTagInitialising = false;
+					if ( status == "error" ) {
+						console.log( xhr.status + " " + xhr.statusText );
+					} else {
+						// proper initialisation
+						$('#etherpad-container-${groupId}').pad({
+							'padId': padId,
+							'host':'${etherpadServerUrl}',
+							'lang':'${fn:toLowerCase(localeLanguage)}',
+							'showControls':${empty showControls ? false : showControls},
+							'showChat': ${empty showChat ? false : showChat},
+							'height': ${empty height ? 'undefined' : height}
+							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+						});
+					}
+				}
+			});
+			// wait for other pad on the page to initialise
+		}, delayBeforeInitialise);
+	});
+</script>
+
+<div class="etherpad-container" id='etherpad-container-${groupId}'></div>
+
+<%-- If content was provided, put it into a hidden div so new lines will not break JavaScript --%>
+<c:if test="${not empty content.trim()}">
+	<span class="etherpad-initial-content" id="etherpad-initial-content-${groupId}">
+		${content}
+	</span>
+</c:if>
\ No newline at end of file
Index: lams_tool_task/web/WEB-INF/tags/ImgButtonWrapper.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_tool_task/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_task/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -1,37 +1,37 @@
-<% 
-/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
- 
- /**
-  * ImgButtonWrapper.tag
-  *	Author: Mitchell Seaton
-  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
-  */
- 
- %>
-<%@ tag body-content="scriptless" %>
-<div id="button-table" class="space-bottom-top">
-	<div id="button-row">
-		<jsp:doBody />
-	</div>
-</div>
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * ImgButtonWrapper.tag
+  *	Author: Mitchell Seaton
+  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
+  */
+ 
+ %>
+<%@ tag body-content="scriptless" %>
+<div id="button-table" class="space-bottom-top">
+	<div id="button-row">
+		<jsp:doBody />
+	</div>
+</div>
Index: lams_tool_task/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r24ebb6c91f49a10f1e5718036b3a3c1a80c3314f -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_tool_task/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 24ebb6c91f49a10f1e5718036b3a3c1a80c3314f)
+++ lams_tool_task/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -344,6 +344,10 @@
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
 	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
Index: lams_tool_vote/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u
--- lams_tool_vote/web/WEB-INF/tags/Etherpad.tag	(revision 0)
+++ lams_tool_vote/web/WEB-INF/tags/Etherpad.tag	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -0,0 +1,98 @@
+<% 
+ /**
+  * Etherpad.tag
+  *	Author: Marcin Cieslak
+  *	Description: Etherpad pad
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+
+<%@ attribute name="groupId" required="true" rtexprvalue="true" %>
+<%@ attribute name="showControls" required="false" rtexprvalue="true" %>
+<%@ attribute name="showChat" required="false" rtexprvalue="true" %>
+<%@ attribute name="height" required="false" rtexprvalue="true" %>
+<%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
+<c:set var="etherpadServerUrl"><%=Configuration.get(ConfigurationKeys.ETHERPAD_SERVER_URL)%></c:set>
+<c:set var="localeLanguage"><lams:user property="localeLanguage" /></c:set>
+<jsp:doBody var="content" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.etherpad-initial-content {
+		display: none;
+	}
+</style>
+
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
+<script type="text/javascript">
+	$(document).ready(function(){
+		// 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;
+		
+		<c:if test="${heightAutoGrow eq 'true'}">
+			// 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:if>
+		
+		window.setTimeout(function(){
+			$.ajax({
+				url: '<lams:LAMSURL/>etherpad/getPad.do',
+				cache : false,
+				type: "GET",
+				data: {
+					groupId : '${groupId}',
+					content : $('#etherpad-initial-content-${groupId}').html()
+				},
+				dataType : 'text',
+				success: function(padId, status, xhr) {
+					lamsEtherpadTagInitialising = false;
+					if ( status == "error" ) {
+						console.log( xhr.status + " " + xhr.statusText );
+					} else {
+						// proper initialisation
+						$('#etherpad-container-${groupId}').pad({
+							'padId': padId,
+							'host':'${etherpadServerUrl}',
+							'lang':'${fn:toLowerCase(localeLanguage)}',
+							'showControls':${empty showControls ? false : showControls},
+							'showChat': ${empty showChat ? false : showChat},
+							'height': ${empty height ? 'undefined' : height}
+							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+						});
+					}
+				}
+			});
+			// wait for other pad on the page to initialise
+		}, delayBeforeInitialise);
+	});
+</script>
+
+<div class="etherpad-container" id='etherpad-container-${groupId}'></div>
+
+<%-- If content was provided, put it into a hidden div so new lines will not break JavaScript --%>
+<c:if test="${not empty content.trim()}">
+	<span class="etherpad-initial-content" id="etherpad-initial-content-${groupId}">
+		${content}
+	</span>
+</c:if>
\ No newline at end of file
Index: lams_tool_vote/web/WEB-INF/tags/ImgButtonWrapper.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_tool_vote/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_vote/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -1,37 +1,37 @@
-<% 
-/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
- 
- /**
-  * ImgButtonWrapper.tag
-  *	Author: Mitchell Seaton
-  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
-  */
- 
- %>
-<%@ tag body-content="scriptless" %>
-<div id="button-table" class="space-bottom-top">
-	<div id="button-row">
-		<jsp:doBody />
-	</div>
-</div>
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * ImgButtonWrapper.tag
+  *	Author: Mitchell Seaton
+  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
+  */
+ 
+ %>
+<%@ tag body-content="scriptless" %>
+<div id="button-table" class="space-bottom-top">
+	<div id="button-row">
+		<jsp:doBody />
+	</div>
+</div>
Index: lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r24ebb6c91f49a10f1e5718036b3a3c1a80c3314f -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 24ebb6c91f49a10f1e5718036b3a3c1a80c3314f)
+++ lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -344,6 +344,10 @@
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
 	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
Index: lams_tool_wiki/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u
--- lams_tool_wiki/web/WEB-INF/tags/Etherpad.tag	(revision 0)
+++ lams_tool_wiki/web/WEB-INF/tags/Etherpad.tag	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -0,0 +1,98 @@
+<% 
+ /**
+  * Etherpad.tag
+  *	Author: Marcin Cieslak
+  *	Description: Etherpad pad
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+
+<%@ attribute name="groupId" required="true" rtexprvalue="true" %>
+<%@ attribute name="showControls" required="false" rtexprvalue="true" %>
+<%@ attribute name="showChat" required="false" rtexprvalue="true" %>
+<%@ attribute name="height" required="false" rtexprvalue="true" %>
+<%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
+<c:set var="etherpadServerUrl"><%=Configuration.get(ConfigurationKeys.ETHERPAD_SERVER_URL)%></c:set>
+<c:set var="localeLanguage"><lams:user property="localeLanguage" /></c:set>
+<jsp:doBody var="content" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.etherpad-initial-content {
+		display: none;
+	}
+</style>
+
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
+<script type="text/javascript">
+	$(document).ready(function(){
+		// 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;
+		
+		<c:if test="${heightAutoGrow eq 'true'}">
+			// 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:if>
+		
+		window.setTimeout(function(){
+			$.ajax({
+				url: '<lams:LAMSURL/>etherpad/getPad.do',
+				cache : false,
+				type: "GET",
+				data: {
+					groupId : '${groupId}',
+					content : $('#etherpad-initial-content-${groupId}').html()
+				},
+				dataType : 'text',
+				success: function(padId, status, xhr) {
+					lamsEtherpadTagInitialising = false;
+					if ( status == "error" ) {
+						console.log( xhr.status + " " + xhr.statusText );
+					} else {
+						// proper initialisation
+						$('#etherpad-container-${groupId}').pad({
+							'padId': padId,
+							'host':'${etherpadServerUrl}',
+							'lang':'${fn:toLowerCase(localeLanguage)}',
+							'showControls':${empty showControls ? false : showControls},
+							'showChat': ${empty showChat ? false : showChat},
+							'height': ${empty height ? 'undefined' : height}
+							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+						});
+					}
+				}
+			});
+			// wait for other pad on the page to initialise
+		}, delayBeforeInitialise);
+	});
+</script>
+
+<div class="etherpad-container" id='etherpad-container-${groupId}'></div>
+
+<%-- If content was provided, put it into a hidden div so new lines will not break JavaScript --%>
+<c:if test="${not empty content.trim()}">
+	<span class="etherpad-initial-content" id="etherpad-initial-content-${groupId}">
+		${content}
+	</span>
+</c:if>
\ No newline at end of file
Index: lams_tool_wiki/web/WEB-INF/tags/ImgButtonWrapper.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_tool_wiki/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_wiki/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -1,37 +1,37 @@
-<% 
-/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
- 
- /**
-  * ImgButtonWrapper.tag
-  *	Author: Mitchell Seaton
-  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
-  */
- 
- %>
-<%@ tag body-content="scriptless" %>
-<div id="button-table" class="space-bottom-top">
-	<div id="button-row">
-		<jsp:doBody />
-	</div>
-</div>
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * ImgButtonWrapper.tag
+  *	Author: Mitchell Seaton
+  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
+  */
+ 
+ %>
+<%@ tag body-content="scriptless" %>
+<div id="button-table" class="space-bottom-top">
+	<div id="button-row">
+		<jsp:doBody />
+	</div>
+</div>
Index: lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r24ebb6c91f49a10f1e5718036b3a3c1a80c3314f -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 24ebb6c91f49a10f1e5718036b3a3c1a80c3314f)
+++ lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -344,6 +344,10 @@
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
 	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
Index: lams_tool_zoom/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u
--- lams_tool_zoom/web/WEB-INF/tags/Etherpad.tag	(revision 0)
+++ lams_tool_zoom/web/WEB-INF/tags/Etherpad.tag	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -0,0 +1,98 @@
+<% 
+ /**
+  * Etherpad.tag
+  *	Author: Marcin Cieslak
+  *	Description: Etherpad pad
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+
+<%@ attribute name="groupId" required="true" rtexprvalue="true" %>
+<%@ attribute name="showControls" required="false" rtexprvalue="true" %>
+<%@ attribute name="showChat" required="false" rtexprvalue="true" %>
+<%@ attribute name="height" required="false" rtexprvalue="true" %>
+<%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
+<c:set var="etherpadServerUrl"><%=Configuration.get(ConfigurationKeys.ETHERPAD_SERVER_URL)%></c:set>
+<c:set var="localeLanguage"><lams:user property="localeLanguage" /></c:set>
+<jsp:doBody var="content" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.etherpad-initial-content {
+		display: none;
+	}
+</style>
+
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
+<script type="text/javascript">
+	$(document).ready(function(){
+		// 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;
+		
+		<c:if test="${heightAutoGrow eq 'true'}">
+			// 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:if>
+		
+		window.setTimeout(function(){
+			$.ajax({
+				url: '<lams:LAMSURL/>etherpad/getPad.do',
+				cache : false,
+				type: "GET",
+				data: {
+					groupId : '${groupId}',
+					content : $('#etherpad-initial-content-${groupId}').html()
+				},
+				dataType : 'text',
+				success: function(padId, status, xhr) {
+					lamsEtherpadTagInitialising = false;
+					if ( status == "error" ) {
+						console.log( xhr.status + " " + xhr.statusText );
+					} else {
+						// proper initialisation
+						$('#etherpad-container-${groupId}').pad({
+							'padId': padId,
+							'host':'${etherpadServerUrl}',
+							'lang':'${fn:toLowerCase(localeLanguage)}',
+							'showControls':${empty showControls ? false : showControls},
+							'showChat': ${empty showChat ? false : showChat},
+							'height': ${empty height ? 'undefined' : height}
+							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+						});
+					}
+				}
+			});
+			// wait for other pad on the page to initialise
+		}, delayBeforeInitialise);
+	});
+</script>
+
+<div class="etherpad-container" id='etherpad-container-${groupId}'></div>
+
+<%-- If content was provided, put it into a hidden div so new lines will not break JavaScript --%>
+<c:if test="${not empty content.trim()}">
+	<span class="etherpad-initial-content" id="etherpad-initial-content-${groupId}">
+		${content}
+	</span>
+</c:if>
\ No newline at end of file
Index: lams_tool_zoom/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r24ebb6c91f49a10f1e5718036b3a3c1a80c3314f -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_tool_zoom/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 24ebb6c91f49a10f1e5718036b3a3c1a80c3314f)
+++ lams_tool_zoom/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -344,6 +344,10 @@
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
 	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
Index: lams_www/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u
--- lams_www/web/WEB-INF/tags/Etherpad.tag	(revision 0)
+++ lams_www/web/WEB-INF/tags/Etherpad.tag	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -0,0 +1,98 @@
+<% 
+ /**
+  * Etherpad.tag
+  *	Author: Marcin Cieslak
+  *	Description: Etherpad pad
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+
+<%@ attribute name="groupId" required="true" rtexprvalue="true" %>
+<%@ attribute name="showControls" required="false" rtexprvalue="true" %>
+<%@ attribute name="showChat" required="false" rtexprvalue="true" %>
+<%@ attribute name="height" required="false" rtexprvalue="true" %>
+<%@ attribute name="heightAutoGrow" required="false" rtexprvalue="true" %>
+
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
+<c:set var="etherpadServerUrl"><%=Configuration.get(ConfigurationKeys.ETHERPAD_SERVER_URL)%></c:set>
+<c:set var="localeLanguage"><lams:user property="localeLanguage" /></c:set>
+<jsp:doBody var="content" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.etherpad-initial-content {
+		display: none;
+	}
+</style>
+
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/etherpad.js"></script>
+<script type="text/javascript">
+	$(document).ready(function(){
+		// 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;
+		
+		<c:if test="${heightAutoGrow eq 'true'}">
+			// 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:if>
+		
+		window.setTimeout(function(){
+			$.ajax({
+				url: '<lams:LAMSURL/>etherpad/getPad.do',
+				cache : false,
+				type: "GET",
+				data: {
+					groupId : '${groupId}',
+					content : $('#etherpad-initial-content-${groupId}').html()
+				},
+				dataType : 'text',
+				success: function(padId, status, xhr) {
+					lamsEtherpadTagInitialising = false;
+					if ( status == "error" ) {
+						console.log( xhr.status + " " + xhr.statusText );
+					} else {
+						// proper initialisation
+						$('#etherpad-container-${groupId}').pad({
+							'padId': padId,
+							'host':'${etherpadServerUrl}',
+							'lang':'${fn:toLowerCase(localeLanguage)}',
+							'showControls':${empty showControls ? false : showControls},
+							'showChat': ${empty showChat ? false : showChat},
+							'height': ${empty height ? 'undefined' : height}
+							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+						});
+					}
+				}
+			});
+			// wait for other pad on the page to initialise
+		}, delayBeforeInitialise);
+	});
+</script>
+
+<div class="etherpad-container" id='etherpad-container-${groupId}'></div>
+
+<%-- If content was provided, put it into a hidden div so new lines will not break JavaScript --%>
+<c:if test="${not empty content.trim()}">
+	<span class="etherpad-initial-content" id="etherpad-initial-content-${groupId}">
+		${content}
+	</span>
+</c:if>
\ No newline at end of file
Index: lams_www/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r24ebb6c91f49a10f1e5718036b3a3c1a80c3314f -rb215f731b063b2e8e4c988355f23fd545d5192a1
--- lams_www/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 24ebb6c91f49a10f1e5718036b3a3c1a80c3314f)
+++ lams_www/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b215f731b063b2e8e4c988355f23fd545d5192a1)
@@ -344,6 +344,10 @@
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
 	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>