Index: lams_admin/web/WEB-INF/tags/Etherpad.tag =================================================================== diff -u -r1e355e0de0fdf5949b115600ab071832734e5948 -r793fc867decb0837cf563bfeb0e284103750a6e3 --- lams_admin/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 1e355e0de0fdf5949b115600ab071832734e5948) +++ lams_admin/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 793fc867decb0837cf563bfeb0e284103750a6e3) @@ -42,14 +42,14 @@ // 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 + // This feature requires ep_resize plugin installed in Etherpad and customised with code in lams_build/conf/etherpad $(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); + height = Math.max(200, msg.data.height - ${showControls ? 0 : 72}); iframe.height(height); } }); Index: lams_central/web/WEB-INF/tags/Etherpad.tag =================================================================== diff -u -r1e355e0de0fdf5949b115600ab071832734e5948 -r793fc867decb0837cf563bfeb0e284103750a6e3 --- lams_central/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 1e355e0de0fdf5949b115600ab071832734e5948) +++ lams_central/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 793fc867decb0837cf563bfeb0e284103750a6e3) @@ -42,14 +42,14 @@ // 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 + // This feature requires ep_resize plugin installed in Etherpad and customised with code in lams_build/conf/etherpad $(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); + height = Math.max(200, msg.data.height - ${showControls ? 0 : 72}); iframe.height(height); } }); Index: lams_gradebook/web/WEB-INF/tags/Etherpad.tag =================================================================== diff -u -r1e355e0de0fdf5949b115600ab071832734e5948 -r793fc867decb0837cf563bfeb0e284103750a6e3 --- lams_gradebook/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 1e355e0de0fdf5949b115600ab071832734e5948) +++ lams_gradebook/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 793fc867decb0837cf563bfeb0e284103750a6e3) @@ -42,14 +42,14 @@ // 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 + // This feature requires ep_resize plugin installed in Etherpad and customised with code in lams_build/conf/etherpad $(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); + height = Math.max(200, msg.data.height - ${showControls ? 0 : 72}); iframe.height(height); } }); Index: lams_learning/web/WEB-INF/tags/Etherpad.tag =================================================================== diff -u -r1e355e0de0fdf5949b115600ab071832734e5948 -r793fc867decb0837cf563bfeb0e284103750a6e3 --- lams_learning/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 1e355e0de0fdf5949b115600ab071832734e5948) +++ lams_learning/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 793fc867decb0837cf563bfeb0e284103750a6e3) @@ -42,14 +42,14 @@ // 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 + // This feature requires ep_resize plugin installed in Etherpad and customised with code in lams_build/conf/etherpad $(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); + height = Math.max(200, msg.data.height - ${showControls ? 0 : 72}); iframe.height(height); } }); Index: lams_monitoring/web/WEB-INF/tags/Etherpad.tag =================================================================== diff -u -r1e355e0de0fdf5949b115600ab071832734e5948 -r793fc867decb0837cf563bfeb0e284103750a6e3 --- lams_monitoring/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 1e355e0de0fdf5949b115600ab071832734e5948) +++ lams_monitoring/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 793fc867decb0837cf563bfeb0e284103750a6e3) @@ -42,14 +42,14 @@ // 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 + // This feature requires ep_resize plugin installed in Etherpad and customised with code in lams_build/conf/etherpad $(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); + height = Math.max(200, msg.data.height - ${showControls ? 0 : 72}); iframe.height(height); } }); Index: lams_tool_assessment/web/WEB-INF/tags/Etherpad.tag =================================================================== diff -u -r1e355e0de0fdf5949b115600ab071832734e5948 -r793fc867decb0837cf563bfeb0e284103750a6e3 --- lams_tool_assessment/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 1e355e0de0fdf5949b115600ab071832734e5948) +++ lams_tool_assessment/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 793fc867decb0837cf563bfeb0e284103750a6e3) @@ -42,14 +42,14 @@ // 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 + // This feature requires ep_resize plugin installed in Etherpad and customised with code in lams_build/conf/etherpad $(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); + height = Math.max(200, msg.data.height - ${showControls ? 0 : 72}); iframe.height(height); } }); Index: lams_tool_chat/web/WEB-INF/tags/Etherpad.tag =================================================================== diff -u -r1e355e0de0fdf5949b115600ab071832734e5948 -r793fc867decb0837cf563bfeb0e284103750a6e3 --- lams_tool_chat/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 1e355e0de0fdf5949b115600ab071832734e5948) +++ lams_tool_chat/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 793fc867decb0837cf563bfeb0e284103750a6e3) @@ -42,14 +42,14 @@ // 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 + // This feature requires ep_resize plugin installed in Etherpad and customised with code in lams_build/conf/etherpad $(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); + height = Math.max(200, msg.data.height - ${showControls ? 0 : 72}); iframe.height(height); } }); Index: lams_tool_daco/web/WEB-INF/tags/Etherpad.tag =================================================================== diff -u -r1e355e0de0fdf5949b115600ab071832734e5948 -r793fc867decb0837cf563bfeb0e284103750a6e3 --- lams_tool_daco/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 1e355e0de0fdf5949b115600ab071832734e5948) +++ lams_tool_daco/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 793fc867decb0837cf563bfeb0e284103750a6e3) @@ -42,14 +42,14 @@ // 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 + // This feature requires ep_resize plugin installed in Etherpad and customised with code in lams_build/conf/etherpad $(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); + height = Math.max(200, msg.data.height - ${showControls ? 0 : 72}); iframe.height(height); } }); Index: lams_tool_doku/web/WEB-INF/tags/Etherpad.tag =================================================================== diff -u -r1e355e0de0fdf5949b115600ab071832734e5948 -r793fc867decb0837cf563bfeb0e284103750a6e3 --- lams_tool_doku/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 1e355e0de0fdf5949b115600ab071832734e5948) +++ lams_tool_doku/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 793fc867decb0837cf563bfeb0e284103750a6e3) @@ -42,14 +42,14 @@ // 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 + // This feature requires ep_resize plugin installed in Etherpad and customised with code in lams_build/conf/etherpad $(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); + height = Math.max(200, msg.data.height - ${showControls ? 0 : 72}); iframe.height(height); } }); Index: lams_tool_forum/web/WEB-INF/tags/Etherpad.tag =================================================================== diff -u -r1e355e0de0fdf5949b115600ab071832734e5948 -r793fc867decb0837cf563bfeb0e284103750a6e3 --- lams_tool_forum/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 1e355e0de0fdf5949b115600ab071832734e5948) +++ lams_tool_forum/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 793fc867decb0837cf563bfeb0e284103750a6e3) @@ -42,14 +42,14 @@ // 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 + // This feature requires ep_resize plugin installed in Etherpad and customised with code in lams_build/conf/etherpad $(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); + height = Math.max(200, msg.data.height - ${showControls ? 0 : 72}); iframe.height(height); } }); Index: lams_tool_gmap/web/WEB-INF/tags/Etherpad.tag =================================================================== diff -u -r1e355e0de0fdf5949b115600ab071832734e5948 -r793fc867decb0837cf563bfeb0e284103750a6e3 --- lams_tool_gmap/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 1e355e0de0fdf5949b115600ab071832734e5948) +++ lams_tool_gmap/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 793fc867decb0837cf563bfeb0e284103750a6e3) @@ -42,14 +42,14 @@ // 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 + // This feature requires ep_resize plugin installed in Etherpad and customised with code in lams_build/conf/etherpad $(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); + height = Math.max(200, msg.data.height - ${showControls ? 0 : 72}); iframe.height(height); } }); Index: lams_tool_images/web/WEB-INF/tags/Etherpad.tag =================================================================== diff -u -r1e355e0de0fdf5949b115600ab071832734e5948 -r793fc867decb0837cf563bfeb0e284103750a6e3 --- lams_tool_images/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 1e355e0de0fdf5949b115600ab071832734e5948) +++ lams_tool_images/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 793fc867decb0837cf563bfeb0e284103750a6e3) @@ -42,14 +42,14 @@ // 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 + // This feature requires ep_resize plugin installed in Etherpad and customised with code in lams_build/conf/etherpad $(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); + height = Math.max(200, msg.data.height - ${showControls ? 0 : 72}); iframe.height(height); } }); Index: lams_tool_imscc/web/WEB-INF/tags/Etherpad.tag =================================================================== diff -u -r1e355e0de0fdf5949b115600ab071832734e5948 -r793fc867decb0837cf563bfeb0e284103750a6e3 --- lams_tool_imscc/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 1e355e0de0fdf5949b115600ab071832734e5948) +++ lams_tool_imscc/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 793fc867decb0837cf563bfeb0e284103750a6e3) @@ -42,14 +42,14 @@ // 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 + // This feature requires ep_resize plugin installed in Etherpad and customised with code in lams_build/conf/etherpad $(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); + height = Math.max(200, msg.data.height - ${showControls ? 0 : 72}); iframe.height(height); } }); Index: lams_tool_lamc/web/WEB-INF/tags/Etherpad.tag =================================================================== diff -u -r1e355e0de0fdf5949b115600ab071832734e5948 -r793fc867decb0837cf563bfeb0e284103750a6e3 --- lams_tool_lamc/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 1e355e0de0fdf5949b115600ab071832734e5948) +++ lams_tool_lamc/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 793fc867decb0837cf563bfeb0e284103750a6e3) @@ -42,14 +42,14 @@ // 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 + // This feature requires ep_resize plugin installed in Etherpad and customised with code in lams_build/conf/etherpad $(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); + height = Math.max(200, msg.data.height - ${showControls ? 0 : 72}); iframe.height(height); } }); Index: lams_tool_laqa/web/WEB-INF/tags/Etherpad.tag =================================================================== diff -u -r1e355e0de0fdf5949b115600ab071832734e5948 -r793fc867decb0837cf563bfeb0e284103750a6e3 --- lams_tool_laqa/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 1e355e0de0fdf5949b115600ab071832734e5948) +++ lams_tool_laqa/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 793fc867decb0837cf563bfeb0e284103750a6e3) @@ -42,14 +42,14 @@ // 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 + // This feature requires ep_resize plugin installed in Etherpad and customised with code in lams_build/conf/etherpad $(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); + height = Math.max(200, msg.data.height - ${showControls ? 0 : 72}); iframe.height(height); } }); Index: lams_tool_larsrc/web/WEB-INF/tags/Etherpad.tag =================================================================== diff -u -r1e355e0de0fdf5949b115600ab071832734e5948 -r793fc867decb0837cf563bfeb0e284103750a6e3 --- lams_tool_larsrc/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 1e355e0de0fdf5949b115600ab071832734e5948) +++ lams_tool_larsrc/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 793fc867decb0837cf563bfeb0e284103750a6e3) @@ -42,14 +42,14 @@ // 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 + // This feature requires ep_resize plugin installed in Etherpad and customised with code in lams_build/conf/etherpad $(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); + height = Math.max(200, msg.data.height - ${showControls ? 0 : 72}); iframe.height(height); } }); Index: lams_tool_leader/web/WEB-INF/tags/Etherpad.tag =================================================================== diff -u -r1e355e0de0fdf5949b115600ab071832734e5948 -r793fc867decb0837cf563bfeb0e284103750a6e3 --- lams_tool_leader/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 1e355e0de0fdf5949b115600ab071832734e5948) +++ lams_tool_leader/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 793fc867decb0837cf563bfeb0e284103750a6e3) @@ -42,14 +42,14 @@ // 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 + // This feature requires ep_resize plugin installed in Etherpad and customised with code in lams_build/conf/etherpad $(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); + height = Math.max(200, msg.data.height - ${showControls ? 0 : 72}); iframe.height(height); } }); Index: lams_tool_mindmap/web/WEB-INF/tags/Etherpad.tag =================================================================== diff -u -r1e355e0de0fdf5949b115600ab071832734e5948 -r793fc867decb0837cf563bfeb0e284103750a6e3 --- lams_tool_mindmap/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 1e355e0de0fdf5949b115600ab071832734e5948) +++ lams_tool_mindmap/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 793fc867decb0837cf563bfeb0e284103750a6e3) @@ -42,14 +42,14 @@ // 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 + // This feature requires ep_resize plugin installed in Etherpad and customised with code in lams_build/conf/etherpad $(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); + height = Math.max(200, msg.data.height - ${showControls ? 0 : 72}); iframe.height(height); } }); Index: lams_tool_nb/web/WEB-INF/tags/Etherpad.tag =================================================================== diff -u -r1e355e0de0fdf5949b115600ab071832734e5948 -r793fc867decb0837cf563bfeb0e284103750a6e3 --- lams_tool_nb/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 1e355e0de0fdf5949b115600ab071832734e5948) +++ lams_tool_nb/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 793fc867decb0837cf563bfeb0e284103750a6e3) @@ -42,14 +42,14 @@ // 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 + // This feature requires ep_resize plugin installed in Etherpad and customised with code in lams_build/conf/etherpad $(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); + height = Math.max(200, msg.data.height - ${showControls ? 0 : 72}); iframe.height(height); } }); Index: lams_tool_notebook/web/WEB-INF/tags/Etherpad.tag =================================================================== diff -u -r1e355e0de0fdf5949b115600ab071832734e5948 -r793fc867decb0837cf563bfeb0e284103750a6e3 --- lams_tool_notebook/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 1e355e0de0fdf5949b115600ab071832734e5948) +++ lams_tool_notebook/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 793fc867decb0837cf563bfeb0e284103750a6e3) @@ -42,14 +42,14 @@ // 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 + // This feature requires ep_resize plugin installed in Etherpad and customised with code in lams_build/conf/etherpad $(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); + height = Math.max(200, msg.data.height - ${showControls ? 0 : 72}); iframe.height(height); } }); Index: lams_tool_pixlr/web/WEB-INF/tags/Etherpad.tag =================================================================== diff -u -r1e355e0de0fdf5949b115600ab071832734e5948 -r793fc867decb0837cf563bfeb0e284103750a6e3 --- lams_tool_pixlr/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 1e355e0de0fdf5949b115600ab071832734e5948) +++ lams_tool_pixlr/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 793fc867decb0837cf563bfeb0e284103750a6e3) @@ -42,14 +42,14 @@ // 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 + // This feature requires ep_resize plugin installed in Etherpad and customised with code in lams_build/conf/etherpad $(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); + height = Math.max(200, msg.data.height - ${showControls ? 0 : 72}); iframe.height(height); } }); Index: lams_tool_preview/web/WEB-INF/tags/Etherpad.tag =================================================================== diff -u -r1e355e0de0fdf5949b115600ab071832734e5948 -r793fc867decb0837cf563bfeb0e284103750a6e3 --- lams_tool_preview/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 1e355e0de0fdf5949b115600ab071832734e5948) +++ lams_tool_preview/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 793fc867decb0837cf563bfeb0e284103750a6e3) @@ -42,14 +42,14 @@ // 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 + // This feature requires ep_resize plugin installed in Etherpad and customised with code in lams_build/conf/etherpad $(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); + height = Math.max(200, msg.data.height - ${showControls ? 0 : 72}); iframe.height(height); } }); Index: lams_tool_sbmt/web/WEB-INF/tags/Etherpad.tag =================================================================== diff -u -r1e355e0de0fdf5949b115600ab071832734e5948 -r793fc867decb0837cf563bfeb0e284103750a6e3 --- lams_tool_sbmt/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 1e355e0de0fdf5949b115600ab071832734e5948) +++ lams_tool_sbmt/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 793fc867decb0837cf563bfeb0e284103750a6e3) @@ -42,14 +42,14 @@ // 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 + // This feature requires ep_resize plugin installed in Etherpad and customised with code in lams_build/conf/etherpad $(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); + height = Math.max(200, msg.data.height - ${showControls ? 0 : 72}); iframe.height(height); } }); Index: lams_tool_scratchie/web/WEB-INF/tags/Etherpad.tag =================================================================== diff -u -r5648803ecd6be1b5c3e62d8a574bb1fd39661110 -r793fc867decb0837cf563bfeb0e284103750a6e3 --- lams_tool_scratchie/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 5648803ecd6be1b5c3e62d8a574bb1fd39661110) +++ lams_tool_scratchie/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 793fc867decb0837cf563bfeb0e284103750a6e3) @@ -42,14 +42,14 @@ // 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 + // This feature requires ep_resize plugin installed in Etherpad and customised with code in lams_build/conf/etherpad $(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); + height = Math.max(200, msg.data.height - ${showControls ? 0 : 72}); iframe.height(height); } }); Index: lams_tool_scribe/web/WEB-INF/tags/Etherpad.tag =================================================================== diff -u -r1e355e0de0fdf5949b115600ab071832734e5948 -r793fc867decb0837cf563bfeb0e284103750a6e3 --- lams_tool_scribe/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 1e355e0de0fdf5949b115600ab071832734e5948) +++ lams_tool_scribe/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 793fc867decb0837cf563bfeb0e284103750a6e3) @@ -42,14 +42,14 @@ // 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 + // This feature requires ep_resize plugin installed in Etherpad and customised with code in lams_build/conf/etherpad $(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); + height = Math.max(200, msg.data.height - ${showControls ? 0 : 72}); iframe.height(height); } }); Index: lams_tool_spreadsheet/web/WEB-INF/tags/Etherpad.tag =================================================================== diff -u -r1e355e0de0fdf5949b115600ab071832734e5948 -r793fc867decb0837cf563bfeb0e284103750a6e3 --- lams_tool_spreadsheet/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 1e355e0de0fdf5949b115600ab071832734e5948) +++ lams_tool_spreadsheet/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 793fc867decb0837cf563bfeb0e284103750a6e3) @@ -42,14 +42,14 @@ // 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 + // This feature requires ep_resize plugin installed in Etherpad and customised with code in lams_build/conf/etherpad $(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); + height = Math.max(200, msg.data.height - ${showControls ? 0 : 72}); iframe.height(height); } }); Index: lams_tool_survey/web/WEB-INF/tags/Etherpad.tag =================================================================== diff -u -r1e355e0de0fdf5949b115600ab071832734e5948 -r793fc867decb0837cf563bfeb0e284103750a6e3 --- lams_tool_survey/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 1e355e0de0fdf5949b115600ab071832734e5948) +++ lams_tool_survey/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 793fc867decb0837cf563bfeb0e284103750a6e3) @@ -42,14 +42,14 @@ // 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 + // This feature requires ep_resize plugin installed in Etherpad and customised with code in lams_build/conf/etherpad $(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); + height = Math.max(200, msg.data.height - ${showControls ? 0 : 72}); iframe.height(height); } }); Index: lams_tool_task/web/WEB-INF/tags/Etherpad.tag =================================================================== diff -u -r1e355e0de0fdf5949b115600ab071832734e5948 -r793fc867decb0837cf563bfeb0e284103750a6e3 --- lams_tool_task/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 1e355e0de0fdf5949b115600ab071832734e5948) +++ lams_tool_task/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 793fc867decb0837cf563bfeb0e284103750a6e3) @@ -42,14 +42,14 @@ // 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 + // This feature requires ep_resize plugin installed in Etherpad and customised with code in lams_build/conf/etherpad $(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); + height = Math.max(200, msg.data.height - ${showControls ? 0 : 72}); iframe.height(height); } }); Index: lams_tool_vote/web/WEB-INF/tags/Etherpad.tag =================================================================== diff -u -r1e355e0de0fdf5949b115600ab071832734e5948 -r793fc867decb0837cf563bfeb0e284103750a6e3 --- lams_tool_vote/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 1e355e0de0fdf5949b115600ab071832734e5948) +++ lams_tool_vote/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 793fc867decb0837cf563bfeb0e284103750a6e3) @@ -42,14 +42,14 @@ // 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 + // This feature requires ep_resize plugin installed in Etherpad and customised with code in lams_build/conf/etherpad $(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); + height = Math.max(200, msg.data.height - ${showControls ? 0 : 72}); iframe.height(height); } }); Index: lams_tool_wiki/web/WEB-INF/tags/Etherpad.tag =================================================================== diff -u -r1e355e0de0fdf5949b115600ab071832734e5948 -r793fc867decb0837cf563bfeb0e284103750a6e3 --- lams_tool_wiki/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 1e355e0de0fdf5949b115600ab071832734e5948) +++ lams_tool_wiki/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 793fc867decb0837cf563bfeb0e284103750a6e3) @@ -42,14 +42,14 @@ // 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 + // This feature requires ep_resize plugin installed in Etherpad and customised with code in lams_build/conf/etherpad $(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); + height = Math.max(200, msg.data.height - ${showControls ? 0 : 72}); iframe.height(height); } }); Index: lams_tool_zoom/web/WEB-INF/tags/Etherpad.tag =================================================================== diff -u -r1e355e0de0fdf5949b115600ab071832734e5948 -r793fc867decb0837cf563bfeb0e284103750a6e3 --- lams_tool_zoom/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 1e355e0de0fdf5949b115600ab071832734e5948) +++ lams_tool_zoom/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 793fc867decb0837cf563bfeb0e284103750a6e3) @@ -42,14 +42,14 @@ // 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 + // This feature requires ep_resize plugin installed in Etherpad and customised with code in lams_build/conf/etherpad $(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); + height = Math.max(200, msg.data.height - ${showControls ? 0 : 72}); iframe.height(height); } }); Index: lams_www/web/WEB-INF/tags/Etherpad.tag =================================================================== diff -u -r1e355e0de0fdf5949b115600ab071832734e5948 -r793fc867decb0837cf563bfeb0e284103750a6e3 --- lams_www/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 1e355e0de0fdf5949b115600ab071832734e5948) +++ lams_www/web/WEB-INF/tags/Etherpad.tag (.../Etherpad.tag) (revision 793fc867decb0837cf563bfeb0e284103750a6e3) @@ -42,14 +42,14 @@ // 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 + // This feature requires ep_resize plugin installed in Etherpad and customised with code in lams_build/conf/etherpad $(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); + height = Math.max(200, msg.data.height - ${showControls ? 0 : 72}); iframe.height(height); } });