Index: lams_admin/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.14.2.2 -r1.14.2.3
--- lams_admin/web/WEB-INF/tags/CKEditor.tag	16 Jun 2016 03:10:20 -0000	1.14.2.2
+++ lams_admin/web/WEB-INF/tags/CKEditor.tag	9 Nov 2016 06:00:17 -0000	1.14.2.3
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.15.2.3 -r1.15.2.4
--- lams_central/web/WEB-INF/tags/CKEditor.tag	11 May 2016 13:00:48 -0000	1.15.2.3
+++ lams_central/web/WEB-INF/tags/CKEditor.tag	9 Nov 2016 06:00:05 -0000	1.15.2.4
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/css/authoring.css,v
diff -u -r1.30.2.17 -r1.30.2.18
--- lams_central/web/css/authoring.css	7 Nov 2016 10:48:26 -0000	1.30.2.17
+++ lams_central/web/css/authoring.css	9 Nov 2016 06:00:05 -0000	1.30.2.18
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/css/Attic/inlineeditor.css,v
diff -u -r1.1.2.2 -r1.1.2.3
--- lams_central/web/css/inlineeditor.css	9 Nov 2016 00:54:14 -0000	1.1.2.2
+++ lams_central/web/css/inlineeditor.css	9 Nov 2016 06:00:05 -0000	1.1.2.3
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/ckconfig_custom.js,v
diff -u -r1.19.2.10 -r1.19.2.11
--- lams_central/web/includes/javascript/ckconfig_custom.js	9 Nov 2016 00:54:14 -0000	1.19.2.10
+++ lams_central/web/includes/javascript/ckconfig_custom.js	9 Nov 2016 06:00:05 -0000	1.19.2.11
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.14.2.3 -r1.14.2.4
--- lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag	29 Jun 2016 05:35:43 -0000	1.14.2.3
+++ lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag	9 Nov 2016 06:00:00 -0000	1.14.2.4
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_bbb/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.5.2.2 -r1.5.2.3
--- lams_tool_bbb/web/WEB-INF/tags/CKEditor.tag	19 May 2016 07:00:22 -0000	1.5.2.2
+++ lams_tool_bbb/web/WEB-INF/tags/CKEditor.tag	9 Nov 2016 06:00:16 -0000	1.5.2.3
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.14.2.2 -r1.14.2.3
--- lams_tool_chat/web/WEB-INF/tags/CKEditor.tag	25 May 2016 12:46:56 -0000	1.14.2.2
+++ lams_tool_chat/web/WEB-INF/tags/CKEditor.tag	9 Nov 2016 06:00:21 -0000	1.14.2.3
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.14.2.3 -r1.14.2.4
--- lams_tool_daco/web/WEB-INF/tags/CKEditor.tag	11 May 2016 13:01:30 -0000	1.14.2.3
+++ lams_tool_daco/web/WEB-INF/tags/CKEditor.tag	9 Nov 2016 06:00:03 -0000	1.14.2.4
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/.classpath,v
diff -u -r1.20.2.11 -r1.20.2.12
--- lams_tool_forum/.classpath	25 Nov 2014 10:47:24 -0000	1.20.2.11
+++ lams_tool_forum/.classpath	9 Nov 2016 06:00:07 -0000	1.20.2.12
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.14.2.3 -r1.14.2.4
--- lams_tool_forum/web/WEB-INF/tags/CKEditor.tag	11 May 2016 13:02:17 -0000	1.14.2.3
+++ lams_tool_forum/web/WEB-INF/tags/CKEditor.tag	9 Nov 2016 06:00:07 -0000	1.14.2.4
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.14.2.2 -r1.14.2.3
--- lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag	12 May 2016 02:48:43 -0000	1.14.2.2
+++ lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag	9 Nov 2016 05:59:57 -0000	1.14.2.3
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.14.2.3 -r1.14.2.4
--- lams_tool_images/web/WEB-INF/tags/CKEditor.tag	29 Jun 2016 12:55:50 -0000	1.14.2.3
+++ lams_tool_images/web/WEB-INF/tags/CKEditor.tag	9 Nov 2016 06:00:15 -0000	1.14.2.4
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.5.2.3 -r1.5.2.4
--- lams_tool_imscc/web/WEB-INF/tags/CKEditor.tag	29 Jun 2016 12:56:53 -0000	1.5.2.3
+++ lams_tool_imscc/web/WEB-INF/tags/CKEditor.tag	9 Nov 2016 06:00:02 -0000	1.5.2.4
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_kaltura/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.3.2.3 -r1.3.2.4
--- lams_tool_kaltura/web/WEB-INF/tags/CKEditor.tag	30 Jun 2016 01:26:41 -0000	1.3.2.3
+++ lams_tool_kaltura/web/WEB-INF/tags/CKEditor.tag	9 Nov 2016 06:00:23 -0000	1.3.2.4
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.14.2.2 -r1.14.2.3
--- lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag	24 May 2016 13:45:12 -0000	1.14.2.2
+++ lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag	9 Nov 2016 06:00:10 -0000	1.14.2.3
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/.classpath,v
diff -u -r1.16.2.9 -r1.16.2.10
--- lams_tool_laqa/.classpath	25 Nov 2014 10:47:28 -0000	1.16.2.9
+++ lams_tool_laqa/.classpath	9 Nov 2016 06:00:18 -0000	1.16.2.10
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.14.2.2 -r1.14.2.3
--- lams_tool_laqa/web/WEB-INF/tags/CKEditor.tag	25 May 2016 16:25:17 -0000	1.14.2.2
+++ lams_tool_laqa/web/WEB-INF/tags/CKEditor.tag	9 Nov 2016 06:00:18 -0000	1.14.2.3
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.14.2.2 -r1.14.2.3
--- lams_tool_larsrc/web/WEB-INF/tags/CKEditor.tag	19 May 2016 04:22:36 -0000	1.14.2.2
+++ lams_tool_larsrc/web/WEB-INF/tags/CKEditor.tag	9 Nov 2016 06:00:19 -0000	1.14.2.3
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_leader/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.2.2.2 -r1.2.2.3
--- lams_tool_leader/web/WEB-INF/tags/CKEditor.tag	30 May 2016 11:26:41 -0000	1.2.2.2
+++ lams_tool_leader/web/WEB-INF/tags/CKEditor.tag	9 Nov 2016 06:00:11 -0000	1.2.2.3
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.14.2.3 -r1.14.2.4
--- lams_tool_mindmap/web/WEB-INF/tags/CKEditor.tag	30 Jun 2016 07:30:26 -0000	1.14.2.3
+++ lams_tool_mindmap/web/WEB-INF/tags/CKEditor.tag	9 Nov 2016 06:00:09 -0000	1.14.2.4
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.14.2.3 -r1.14.2.4
--- lams_tool_nb/web/WEB-INF/tags/CKEditor.tag	11 May 2016 13:03:24 -0000	1.14.2.3
+++ lams_tool_nb/web/WEB-INF/tags/CKEditor.tag	9 Nov 2016 05:59:59 -0000	1.14.2.4
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/authoring/basic.jsp,v
diff -u -r1.8.2.2 -r1.8.2.3
--- lams_tool_nb/web/authoring/basic.jsp	29 Apr 2016 01:11:32 -0000	1.8.2.2
+++ lams_tool_nb/web/authoring/basic.jsp	9 Nov 2016 05:59:59 -0000	1.8.2.3
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.15.2.2 -r1.15.2.3
--- lams_tool_notebook/web/WEB-INF/tags/CKEditor.tag	17 May 2016 10:20:12 -0000	1.15.2.2
+++ lams_tool_notebook/web/WEB-INF/tags/CKEditor.tag	9 Nov 2016 06:00:04 -0000	1.15.2.3
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_pixlr/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.14.2.3 -r1.14.2.4
--- lams_tool_pixlr/web/WEB-INF/tags/CKEditor.tag	1 Jul 2016 02:08:30 -0000	1.14.2.3
+++ lams_tool_pixlr/web/WEB-INF/tags/CKEditor.tag	9 Nov 2016 06:00:08 -0000	1.14.2.4
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/.cvsignore,v
diff -u -r1.1 -r1.1.2.1
--- lams_tool_preview/.cvsignore	24 Jul 2015 00:34:30 -0000	1.1
+++ lams_tool_preview/.cvsignore	9 Nov 2016 06:00:11 -0000	1.1.2.1
@@ -1,2 +1,2 @@
 build
-bin
+bin
\ No newline at end of file
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_preview/.settings/.cvsignore'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_preview/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_preview/web/WEB-INF/tags/CKEditor.tag	16 May 2016 13:28:48 -0000	1.1.2.1
+++ lams_tool_preview/web/WEB-INF/tags/CKEditor.tag	9 Nov 2016 06:00:12 -0000	1.1.2.2
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.14.2.2 -r1.14.2.3
--- lams_tool_sbmt/web/WEB-INF/tags/CKEditor.tag	19 May 2016 10:23:59 -0000	1.14.2.2
+++ lams_tool_sbmt/web/WEB-INF/tags/CKEditor.tag	9 Nov 2016 05:59:59 -0000	1.14.2.3
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.3.2.2 -r1.3.2.3
--- lams_tool_scratchie/web/WEB-INF/tags/CKEditor.tag	1 Jun 2016 04:21:35 -0000	1.3.2.2
+++ lams_tool_scratchie/web/WEB-INF/tags/CKEditor.tag	9 Nov 2016 06:00:17 -0000	1.3.2.3
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.14.2.2 -r1.14.2.3
--- lams_tool_scribe/web/WEB-INF/tags/CKEditor.tag	31 May 2016 03:00:54 -0000	1.14.2.2
+++ lams_tool_scribe/web/WEB-INF/tags/CKEditor.tag	9 Nov 2016 06:00:22 -0000	1.14.2.3
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.14.2.2 -r1.14.2.3
--- lams_tool_spreadsheet/web/WEB-INF/tags/CKEditor.tag	12 May 2016 00:48:06 -0000	1.14.2.2
+++ lams_tool_spreadsheet/web/WEB-INF/tags/CKEditor.tag	9 Nov 2016 06:00:14 -0000	1.14.2.3
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.14.2.2 -r1.14.2.3
--- lams_tool_survey/web/WEB-INF/tags/CKEditor.tag	4 Jun 2016 10:23:43 -0000	1.14.2.2
+++ lams_tool_survey/web/WEB-INF/tags/CKEditor.tag	9 Nov 2016 06:00:20 -0000	1.14.2.3
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.14.2.2 -r1.14.2.3
--- lams_tool_task/web/WEB-INF/tags/CKEditor.tag	3 Jun 2016 00:18:10 -0000	1.14.2.2
+++ lams_tool_task/web/WEB-INF/tags/CKEditor.tag	9 Nov 2016 05:59:58 -0000	1.14.2.3
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.14.2.2 -r1.14.2.3
--- lams_tool_vote/web/WEB-INF/tags/CKEditor.tag	26 May 2016 13:01:09 -0000	1.14.2.2
+++ lams_tool_vote/web/WEB-INF/tags/CKEditor.tag	9 Nov 2016 06:00:24 -0000	1.14.2.3
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.14.2.2 -r1.14.2.3
--- lams_tool_wiki/web/WEB-INF/tags/CKEditor.tag	25 May 2016 04:32:18 -0000	1.14.2.2
+++ lams_tool_wiki/web/WEB-INF/tags/CKEditor.tag	9 Nov 2016 06:00:06 -0000	1.14.2.3
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_www/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.2.2.3 -r1.2.2.4
--- lams_www/web/WEB-INF/tags/CKEditor.tag	29 Jun 2016 02:10:35 -0000	1.2.2.3
+++ lams_www/web/WEB-INF/tags/CKEditor.tag	9 Nov 2016 06:00:13 -0000	1.2.2.4
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_www/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.2 -r1.1.2.3
--- lams_www/web/WEB-INF/tags/Page.tag	11 Aug 2016 13:19:34 -0000	1.1.2.2
+++ lams_www/web/WEB-INF/tags/Page.tag	9 Nov 2016 06:00:13 -0000	1.1.2.3
@@ -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>