Index: lams_admin/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -rf7cb84defcd7ff6e4f3232f2ef1856f1311215d9 -r0441b6caf440e4a40163c2aa4ba1f4002051fc81
--- lams_admin/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision f7cb84defcd7ff6e4f3232f2ef1856f1311215d9)
+++ lams_admin/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 0441b6caf440e4a40163c2aa4ba1f4002051fc81)
@@ -36,9 +36,6 @@
 	<c:set var="width" value="100%" />
 </c:if>
 
-<c:if test="${empty height}">
-	<c:set var="height" value="100px" />
-</c:if>
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
Index: lams_central/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r0eb7ade673087d05ad334871a31bdacf0f30a103 -r0441b6caf440e4a40163c2aa4ba1f4002051fc81
--- lams_central/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 0eb7ade673087d05ad334871a31bdacf0f30a103)
+++ lams_central/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 0441b6caf440e4a40163c2aa4ba1f4002051fc81)
@@ -36,9 +36,6 @@
 	<c:set var="width" value="100%" />
 </c:if>
 
-<c:if test="${empty height}">
-	<c:set var="height" value="100px" />
-</c:if>
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
Index: lams_central/web/css/authoring.css
===================================================================
diff -u -r07b056c293f01953393020b340c932d99c4a0a0b -r0441b6caf440e4a40163c2aa4ba1f4002051fc81
--- lams_central/web/css/authoring.css	(.../authoring.css)	(revision 07b056c293f01953393020b340c932d99c4a0a0b)
+++ lams_central/web/css/authoring.css	(.../authoring.css)	(revision 0441b6caf440e4a40163c2aa4ba1f4002051fc81)
@@ -440,7 +440,7 @@
 }
 
 #ldDescriptionDiv #ldDescriptionEditorContainer {
-	margin: -15px 15px 15px 0;
+	margin: 0px 15px 15px 0;
 }
 
 #ldDescriptionDiv #ldDescriptionLicenseTextContainer,
Index: lams_central/web/css/inlineeditor.css
===================================================================
diff -u -r5d02c372c3002b02202f01b313e9c6d8c9fdd0cc -r0441b6caf440e4a40163c2aa4ba1f4002051fc81
--- lams_central/web/css/inlineeditor.css	(.../inlineeditor.css)	(revision 5d02c372c3002b02202f01b313e9c6d8c9fdd0cc)
+++ lams_central/web/css/inlineeditor.css	(.../inlineeditor.css)	(revision 0441b6caf440e4a40163c2aa4ba1f4002051fc81)
@@ -16,7 +16,8 @@
   -webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;
        -o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
           transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;	border: 1px solid #c1c1c1;
-  /* LAMS */
+  /* LAMS -  min height is set in ckconfig_custom.js but keep the default here too so that most fields 
+   * are the right size and only the ones where the height is overridden does the size change.  */
   min-height: 60px;
  -webkit-appearance: textfield;
 }
Index: lams_central/web/includes/javascript/ckconfig_custom.js
===================================================================
diff -u -r5d02c372c3002b02202f01b313e9c6d8c9fdd0cc -r0441b6caf440e4a40163c2aa4ba1f4002051fc81
--- lams_central/web/includes/javascript/ckconfig_custom.js	(.../ckconfig_custom.js)	(revision 5d02c372c3002b02202f01b313e9c6d8c9fdd0cc)
+++ lams_central/web/includes/javascript/ckconfig_custom.js	(.../ckconfig_custom.js)	(revision 0441b6caf440e4a40163c2aa4ba1f4002051fc81)
@@ -140,6 +140,14 @@
 });
 
 CKEDITOR.on('instanceReady', function(e){
+	var height = e.editor.config.height;
+	if ( ! height ) {
+		height = "60px";
+	} else if ( height.indexOf("px") == -1 ){
+		height = height + "px";
+	}
+	e.editor._.editable.$.style.minHeight = height;
+	
 	// make all links open in new window
 	e.editor.on('getData', function(f){
 		// create a DOM element for easier manipulation
Index: lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r43109c0633b7699925623470abcf46421b624ff0 -r0441b6caf440e4a40163c2aa4ba1f4002051fc81
--- lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 43109c0633b7699925623470abcf46421b624ff0)
+++ lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 0441b6caf440e4a40163c2aa4ba1f4002051fc81)
@@ -36,9 +36,6 @@
 	<c:set var="width" value="100%" />
 </c:if>
 
-<c:if test="${empty height}">
-	<c:set var="height" value="100px" />
-</c:if>
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
Index: lams_tool_bbb/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r61afce49515660ee5d017b084bcd5a2308fb3bd7 -r0441b6caf440e4a40163c2aa4ba1f4002051fc81
--- lams_tool_bbb/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 61afce49515660ee5d017b084bcd5a2308fb3bd7)
+++ lams_tool_bbb/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 0441b6caf440e4a40163c2aa4ba1f4002051fc81)
@@ -36,9 +36,6 @@
 	<c:set var="width" value="100%" />
 </c:if>
 
-<c:if test="${empty height}">
-	<c:set var="height" value="100px" />
-</c:if>
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
Index: lams_tool_chat/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r8955c559e118a75bcdec763ebae2e745a0421236 -r0441b6caf440e4a40163c2aa4ba1f4002051fc81
--- lams_tool_chat/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 8955c559e118a75bcdec763ebae2e745a0421236)
+++ lams_tool_chat/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 0441b6caf440e4a40163c2aa4ba1f4002051fc81)
@@ -36,9 +36,6 @@
 	<c:set var="width" value="100%" />
 </c:if>
 
-<c:if test="${empty height}">
-	<c:set var="height" value="100px" />
-</c:if>
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
Index: lams_tool_daco/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r0eb7ade673087d05ad334871a31bdacf0f30a103 -r0441b6caf440e4a40163c2aa4ba1f4002051fc81
--- lams_tool_daco/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 0eb7ade673087d05ad334871a31bdacf0f30a103)
+++ lams_tool_daco/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 0441b6caf440e4a40163c2aa4ba1f4002051fc81)
@@ -36,9 +36,6 @@
 	<c:set var="width" value="100%" />
 </c:if>
 
-<c:if test="${empty height}">
-	<c:set var="height" value="100px" />
-</c:if>
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
Index: lams_tool_forum/.classpath
===================================================================
diff -u -r0fdf00ad8ffebc0cc6d79de96a216c08ce0d4cdf -r0441b6caf440e4a40163c2aa4ba1f4002051fc81
--- lams_tool_forum/.classpath	(.../.classpath)	(revision 0fdf00ad8ffebc0cc6d79de96a216c08ce0d4cdf)
+++ lams_tool_forum/.classpath	(.../.classpath)	(revision 0441b6caf440e4a40163c2aa4ba1f4002051fc81)
@@ -10,7 +10,7 @@
 	</classpathentry>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_common"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_contentrepository"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/lams_central"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/lams_central.old"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_learning"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/hibernate/main/hibernate-core-4.3.7.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/hibernate-core">
 		<attributes>
Index: lams_tool_forum/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r9da01dcb50325e62991e22bcbc514086911efc46 -r0441b6caf440e4a40163c2aa4ba1f4002051fc81
--- lams_tool_forum/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 9da01dcb50325e62991e22bcbc514086911efc46)
+++ lams_tool_forum/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 0441b6caf440e4a40163c2aa4ba1f4002051fc81)
@@ -36,9 +36,6 @@
 	<c:set var="width" value="100%" />
 </c:if>
 
-<c:if test="${empty height}">
-	<c:set var="height" value="100px" />
-</c:if>
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
Index: lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r5b49576bf16056685db96302cc25b044bd39e9ce -r0441b6caf440e4a40163c2aa4ba1f4002051fc81
--- lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 5b49576bf16056685db96302cc25b044bd39e9ce)
+++ lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 0441b6caf440e4a40163c2aa4ba1f4002051fc81)
@@ -36,9 +36,6 @@
 	<c:set var="width" value="100%" />
 </c:if>
 
-<c:if test="${empty height}">
-	<c:set var="height" value="100px" />
-</c:if>
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
Index: lams_tool_images/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r91b889b2799b29b15df18c661e46cd1532eb5251 -r0441b6caf440e4a40163c2aa4ba1f4002051fc81
--- lams_tool_images/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 91b889b2799b29b15df18c661e46cd1532eb5251)
+++ lams_tool_images/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 0441b6caf440e4a40163c2aa4ba1f4002051fc81)
@@ -36,9 +36,6 @@
 	<c:set var="width" value="100%" />
 </c:if>
 
-<c:if test="${empty height}">
-	<c:set var="height" value="100px" />
-</c:if>
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
Index: lams_tool_imscc/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r556a6982f300507743b2c917118c0035f1f80d84 -r0441b6caf440e4a40163c2aa4ba1f4002051fc81
--- lams_tool_imscc/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 556a6982f300507743b2c917118c0035f1f80d84)
+++ lams_tool_imscc/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 0441b6caf440e4a40163c2aa4ba1f4002051fc81)
@@ -36,9 +36,6 @@
 	<c:set var="width" value="100%" />
 </c:if>
 
-<c:if test="${empty height}">
-	<c:set var="height" value="100px" />
-</c:if>
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
Index: lams_tool_kaltura/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r9dffcfc34a162e2764264327642af2c6fae5ee01 -r0441b6caf440e4a40163c2aa4ba1f4002051fc81
--- lams_tool_kaltura/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 9dffcfc34a162e2764264327642af2c6fae5ee01)
+++ lams_tool_kaltura/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 0441b6caf440e4a40163c2aa4ba1f4002051fc81)
@@ -36,9 +36,6 @@
 	<c:set var="width" value="100%" />
 </c:if>
 
-<c:if test="${empty height}">
-	<c:set var="height" value="100px" />
-</c:if>
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
Index: lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r00937d78dacc0993260d5ed7b39e4376e432cf45 -r0441b6caf440e4a40163c2aa4ba1f4002051fc81
--- lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 00937d78dacc0993260d5ed7b39e4376e432cf45)
+++ lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 0441b6caf440e4a40163c2aa4ba1f4002051fc81)
@@ -36,9 +36,6 @@
 	<c:set var="width" value="100%" />
 </c:if>
 
-<c:if test="${empty height}">
-	<c:set var="height" value="100px" />
-</c:if>
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
Index: lams_tool_laqa/.classpath
===================================================================
diff -u -r0fdf00ad8ffebc0cc6d79de96a216c08ce0d4cdf -r0441b6caf440e4a40163c2aa4ba1f4002051fc81
--- lams_tool_laqa/.classpath	(.../.classpath)	(revision 0fdf00ad8ffebc0cc6d79de96a216c08ce0d4cdf)
+++ lams_tool_laqa/.classpath	(.../.classpath)	(revision 0441b6caf440e4a40163c2aa4ba1f4002051fc81)
@@ -25,4 +25,5 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/javax/mail/api/main/javax.mail-1.5.1.jar"/>
 </classpath>
Index: lams_tool_laqa/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r320934945c495ab0832be6fb547d83812ac3152a -r0441b6caf440e4a40163c2aa4ba1f4002051fc81
--- lams_tool_laqa/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 320934945c495ab0832be6fb547d83812ac3152a)
+++ lams_tool_laqa/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 0441b6caf440e4a40163c2aa4ba1f4002051fc81)
@@ -36,9 +36,6 @@
 	<c:set var="width" value="100%" />
 </c:if>
 
-<c:if test="${empty height}">
-	<c:set var="height" value="100px" />
-</c:if>
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
Index: lams_tool_larsrc/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -rb3fe40cd67fc779a6eee8320fadc3a489565a557 -r0441b6caf440e4a40163c2aa4ba1f4002051fc81
--- lams_tool_larsrc/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision b3fe40cd67fc779a6eee8320fadc3a489565a557)
+++ lams_tool_larsrc/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 0441b6caf440e4a40163c2aa4ba1f4002051fc81)
@@ -36,9 +36,6 @@
 	<c:set var="width" value="100%" />
 </c:if>
 
-<c:if test="${empty height}">
-	<c:set var="height" value="100px" />
-</c:if>
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
Index: lams_tool_leader/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -ra6f139bf7f2aeceb96792867e30e3de3959bd1f0 -r0441b6caf440e4a40163c2aa4ba1f4002051fc81
--- lams_tool_leader/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision a6f139bf7f2aeceb96792867e30e3de3959bd1f0)
+++ lams_tool_leader/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 0441b6caf440e4a40163c2aa4ba1f4002051fc81)
@@ -36,9 +36,6 @@
 	<c:set var="width" value="100%" />
 </c:if>
 
-<c:if test="${empty height}">
-	<c:set var="height" value="100px" />
-</c:if>
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
Index: lams_tool_mindmap/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r017d7545cab486a7d901af349a9a1015f7f387b6 -r0441b6caf440e4a40163c2aa4ba1f4002051fc81
--- lams_tool_mindmap/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 017d7545cab486a7d901af349a9a1015f7f387b6)
+++ lams_tool_mindmap/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 0441b6caf440e4a40163c2aa4ba1f4002051fc81)
@@ -36,9 +36,6 @@
 	<c:set var="width" value="100%" />
 </c:if>
 
-<c:if test="${empty height}">
-	<c:set var="height" value="100px" />
-</c:if>
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
Index: lams_tool_nb/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r2e4662c1c37267b45e4efc256dacb63e57e4b584 -r0441b6caf440e4a40163c2aa4ba1f4002051fc81
--- lams_tool_nb/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 2e4662c1c37267b45e4efc256dacb63e57e4b584)
+++ lams_tool_nb/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 0441b6caf440e4a40163c2aa4ba1f4002051fc81)
@@ -36,9 +36,6 @@
 	<c:set var="width" value="100%" />
 </c:if>
 
-<c:if test="${empty height}">
-	<c:set var="height" value="100px" />
-</c:if>
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
Index: lams_tool_nb/web/authoring/basic.jsp
===================================================================
diff -u -r91462036d66d1307967706c1db4b66062726595e -r0441b6caf440e4a40163c2aa4ba1f4002051fc81
--- lams_tool_nb/web/authoring/basic.jsp	(.../basic.jsp)	(revision 91462036d66d1307967706c1db4b66062726595e)
+++ lams_tool_nb/web/authoring/basic.jsp	(.../basic.jsp)	(revision 0441b6caf440e4a40163c2aa4ba1f4002051fc81)
@@ -7,6 +7,6 @@
 
 <div class="form-group">
     <label for="title"><fmt:message key="basic.content"/></label>
-	<lams:CKEditor id="basicContent" value="${NbAuthoringForm.basicContent}"
+	<lams:CKEditor id="basicContent" value="${NbAuthoringForm.basicContent}" 
 			contentFolderID="${NbAuthoringForm.contentFolderID}" height="400"></lams:CKEditor>
 </div>
Index: lams_tool_notebook/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -ra0a249e0861e944d080689e4ebb853566cd40f2d -r0441b6caf440e4a40163c2aa4ba1f4002051fc81
--- lams_tool_notebook/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision a0a249e0861e944d080689e4ebb853566cd40f2d)
+++ lams_tool_notebook/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 0441b6caf440e4a40163c2aa4ba1f4002051fc81)
@@ -36,9 +36,6 @@
 	<c:set var="width" value="100%" />
 </c:if>
 
-<c:if test="${empty height}">
-	<c:set var="height" value="100px" />
-</c:if>
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
Index: lams_tool_pixlr/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r6eaaff81c675b592c0efa20bf13dacc7863f460b -r0441b6caf440e4a40163c2aa4ba1f4002051fc81
--- lams_tool_pixlr/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 6eaaff81c675b592c0efa20bf13dacc7863f460b)
+++ lams_tool_pixlr/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 0441b6caf440e4a40163c2aa4ba1f4002051fc81)
@@ -36,9 +36,6 @@
 	<c:set var="width" value="100%" />
 </c:if>
 
-<c:if test="${empty height}">
-	<c:set var="height" value="100px" />
-</c:if>
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
Index: lams_tool_preview/.cvsignore
===================================================================
diff -u -ra93929c9c7f7f0df676412691f2f8f9d44d201a2 -r0441b6caf440e4a40163c2aa4ba1f4002051fc81
--- lams_tool_preview/.cvsignore	(.../.cvsignore)	(revision a93929c9c7f7f0df676412691f2f8f9d44d201a2)
+++ lams_tool_preview/.cvsignore	(.../.cvsignore)	(revision 0441b6caf440e4a40163c2aa4ba1f4002051fc81)
@@ -1,2 +1,2 @@
 build
-bin
+bin
\ No newline at end of file
Index: lams_tool_preview/.settings/.cvsignore
===================================================================
diff -u
--- lams_tool_preview/.settings/.cvsignore	(revision 0)
+++ lams_tool_preview/.settings/.cvsignore	(revision 0441b6caf440e4a40163c2aa4ba1f4002051fc81)
@@ -0,0 +1 @@
+org.jboss.ide.eclipse.as.core.prefs
Index: lams_tool_preview/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -rdaae7481c43033a14d922bf45bcad31be676e7de -r0441b6caf440e4a40163c2aa4ba1f4002051fc81
--- lams_tool_preview/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision daae7481c43033a14d922bf45bcad31be676e7de)
+++ lams_tool_preview/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 0441b6caf440e4a40163c2aa4ba1f4002051fc81)
@@ -36,9 +36,6 @@
 	<c:set var="width" value="100%" />
 </c:if>
 
-<c:if test="${empty height}">
-	<c:set var="height" value="100px" />
-</c:if>
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
Index: lams_tool_sbmt/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r6bed0e62245e6c9ce454d4bc54920a0b41dac9bc -r0441b6caf440e4a40163c2aa4ba1f4002051fc81
--- lams_tool_sbmt/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 6bed0e62245e6c9ce454d4bc54920a0b41dac9bc)
+++ lams_tool_sbmt/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 0441b6caf440e4a40163c2aa4ba1f4002051fc81)
@@ -36,9 +36,6 @@
 	<c:set var="width" value="100%" />
 </c:if>
 
-<c:if test="${empty height}">
-	<c:set var="height" value="100px" />
-</c:if>
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
Index: lams_tool_scratchie/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r9e9c0664745d48fdd504952bb279e5b840675758 -r0441b6caf440e4a40163c2aa4ba1f4002051fc81
--- lams_tool_scratchie/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 9e9c0664745d48fdd504952bb279e5b840675758)
+++ lams_tool_scratchie/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 0441b6caf440e4a40163c2aa4ba1f4002051fc81)
@@ -36,9 +36,6 @@
 	<c:set var="width" value="100%" />
 </c:if>
 
-<c:if test="${empty height}">
-	<c:set var="height" value="100px" />
-</c:if>
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
Index: lams_tool_scribe/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r9732fd6b134b021525bf6be0e8cad758e6beae05 -r0441b6caf440e4a40163c2aa4ba1f4002051fc81
--- lams_tool_scribe/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 9732fd6b134b021525bf6be0e8cad758e6beae05)
+++ lams_tool_scribe/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 0441b6caf440e4a40163c2aa4ba1f4002051fc81)
@@ -36,9 +36,6 @@
 	<c:set var="width" value="100%" />
 </c:if>
 
-<c:if test="${empty height}">
-	<c:set var="height" value="100px" />
-</c:if>
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
Index: lams_tool_spreadsheet/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r0acc4ca56f472b81307b4936c0cc797b71d5cf85 -r0441b6caf440e4a40163c2aa4ba1f4002051fc81
--- lams_tool_spreadsheet/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 0acc4ca56f472b81307b4936c0cc797b71d5cf85)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 0441b6caf440e4a40163c2aa4ba1f4002051fc81)
@@ -36,9 +36,6 @@
 	<c:set var="width" value="100%" />
 </c:if>
 
-<c:if test="${empty height}">
-	<c:set var="height" value="100px" />
-</c:if>
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
Index: lams_tool_survey/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r230631757ce5657c02733128542f738928cc514e -r0441b6caf440e4a40163c2aa4ba1f4002051fc81
--- lams_tool_survey/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 230631757ce5657c02733128542f738928cc514e)
+++ lams_tool_survey/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 0441b6caf440e4a40163c2aa4ba1f4002051fc81)
@@ -36,9 +36,6 @@
 	<c:set var="width" value="100%" />
 </c:if>
 
-<c:if test="${empty height}">
-	<c:set var="height" value="100px" />
-</c:if>
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
Index: lams_tool_task/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -rd6dcae53cbe27a85aedf62b8545ee3193ec55220 -r0441b6caf440e4a40163c2aa4ba1f4002051fc81
--- lams_tool_task/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
+++ lams_tool_task/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 0441b6caf440e4a40163c2aa4ba1f4002051fc81)
@@ -36,9 +36,6 @@
 	<c:set var="width" value="100%" />
 </c:if>
 
-<c:if test="${empty height}">
-	<c:set var="height" value="100px" />
-</c:if>
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
Index: lams_tool_vote/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -rff7583ba24a271222b91ab3ecc460b931fe20e37 -r0441b6caf440e4a40163c2aa4ba1f4002051fc81
--- lams_tool_vote/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision ff7583ba24a271222b91ab3ecc460b931fe20e37)
+++ lams_tool_vote/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 0441b6caf440e4a40163c2aa4ba1f4002051fc81)
@@ -36,9 +36,6 @@
 	<c:set var="width" value="100%" />
 </c:if>
 
-<c:if test="${empty height}">
-	<c:set var="height" value="100px" />
-</c:if>
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
Index: lams_tool_wiki/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -rceae3062bc6d9ad73937168fc0fb12e4fdaa172d -r0441b6caf440e4a40163c2aa4ba1f4002051fc81
--- lams_tool_wiki/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision ceae3062bc6d9ad73937168fc0fb12e4fdaa172d)
+++ lams_tool_wiki/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 0441b6caf440e4a40163c2aa4ba1f4002051fc81)
@@ -36,9 +36,6 @@
 	<c:set var="width" value="100%" />
 </c:if>
 
-<c:if test="${empty height}">
-	<c:set var="height" value="100px" />
-</c:if>
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
Index: lams_www/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -ra86e7d7663a6093c0369048074e955ba9762ba77 -r0441b6caf440e4a40163c2aa4ba1f4002051fc81
--- lams_www/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision a86e7d7663a6093c0369048074e955ba9762ba77)
+++ lams_www/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 0441b6caf440e4a40163c2aa4ba1f4002051fc81)
@@ -36,9 +36,6 @@
 	<c:set var="width" value="100%" />
 </c:if>
 
-<c:if test="${empty height}">
-	<c:set var="height" value="100px" />
-</c:if>
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
Index: lams_www/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rd19a95db673b7cf90351de4d567299c5fa86b450 -r0441b6caf440e4a40163c2aa4ba1f4002051fc81
--- lams_www/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d19a95db673b7cf90351de4d567299c5fa86b450)
+++ lams_www/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 0441b6caf440e4a40163c2aa4ba1f4002051fc81)
@@ -193,6 +193,9 @@
 							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
 								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
 										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
+								<c:if test="${not usePanel}">
+								presenceURL = presenceURL + "&reloadBootstrap=true";
+								</c:if>
 								$('#presenceEnabledPatchDiv').load(presenceURL, function( response, status, xhr ) {
 									if ( status == "error" ) {
 										alert("Unable to load IM: " + xhr.status);
@@ -281,16 +284,15 @@
 							<jsp:doBody />
 						</div>
 					</div>
-					
-					<%--  only have sidebar and presence in learner --%>
-					<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
-					<div id="presenceEnabledPatchDiv"></div>
-					</c:if>
 				</c:when>
 				<c:otherwise>
 					<jsp:doBody />
 				</c:otherwise>
 				</c:choose>						
+				<%--  only have sidebar and presence in learner --%>
+				<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+					<div id="presenceEnabledPatchDiv"></div>
+				</c:if>
 			</div>
 				</div>
 			</div>