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 -r1.14.2.1
--- lams_admin/web/WEB-INF/tags/CKEditor.tag 1 Apr 2014 16:54:32 -0000 1.14
+++ lams_admin/web/WEB-INF/tags/CKEditor.tag 3 Sep 2014 13:19:42 -0000 1.14.2.1
@@ -62,6 +62,7 @@
var instance = CKEDITOR.replace( "${id}", {
width : "${width}",
height : "${height}",
+ autoGrow_minHeight : "${height}".replace("px", ""),
toolbar : "${toolbarSet}",
language : "${language}",
defaultLangugage : "en",
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 -r1.15.2.1
--- lams_central/web/WEB-INF/tags/CKEditor.tag 1 Apr 2014 16:55:11 -0000 1.15
+++ lams_central/web/WEB-INF/tags/CKEditor.tag 3 Sep 2014 13:19:24 -0000 1.15.2.1
@@ -62,6 +62,7 @@
var instance = CKEDITOR.replace( "${id}", {
width : "${width}",
height : "${height}",
+ autoGrow_minHeight : "${height}".replace("px", ""),
toolbar : "${toolbarSet}",
language : "${language}",
defaultLangugage : "en",
Index: lams_gradebook/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.14 -r1.14.2.1
--- lams_gradebook/web/WEB-INF/tags/CKEditor.tag 1 Apr 2014 16:56:02 -0000 1.14
+++ lams_gradebook/web/WEB-INF/tags/CKEditor.tag 3 Sep 2014 13:19:44 -0000 1.14.2.1
@@ -62,6 +62,7 @@
var instance = CKEDITOR.replace( "${id}", {
width : "${width}",
height : "${height}",
+ autoGrow_minHeight : "${height}".replace("px", ""),
toolbar : "${toolbarSet}",
language : "${language}",
defaultLangugage : "en",
Index: lams_learning/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.14 -r1.14.2.1
--- lams_learning/web/WEB-INF/tags/CKEditor.tag 1 Apr 2014 16:56:29 -0000 1.14
+++ lams_learning/web/WEB-INF/tags/CKEditor.tag 3 Sep 2014 13:19:27 -0000 1.14.2.1
@@ -62,6 +62,7 @@
var instance = CKEDITOR.replace( "${id}", {
width : "${width}",
height : "${height}",
+ autoGrow_minHeight : "${height}".replace("px", ""),
toolbar : "${toolbarSet}",
language : "${language}",
defaultLangugage : "en",
Index: lams_monitoring/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.14 -r1.14.2.1
--- lams_monitoring/web/WEB-INF/tags/CKEditor.tag 1 Apr 2014 16:56:57 -0000 1.14
+++ lams_monitoring/web/WEB-INF/tags/CKEditor.tag 3 Sep 2014 13:19:47 -0000 1.14.2.1
@@ -62,6 +62,7 @@
var instance = CKEDITOR.replace( "${id}", {
width : "${width}",
height : "${height}",
+ autoGrow_minHeight : "${height}".replace("px", ""),
toolbar : "${toolbarSet}",
language : "${language}",
defaultLangugage : "en",
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 -r1.14.2.1
--- lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag 1 Apr 2014 16:51:09 -0000 1.14
+++ lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag 3 Sep 2014 13:19:29 -0000 1.14.2.1
@@ -62,6 +62,7 @@
var instance = CKEDITOR.replace( "${id}", {
width : "${width}",
height : "${height}",
+ autoGrow_minHeight : "${height}".replace("px", ""),
toolbar : "${toolbarSet}",
language : "${language}",
defaultLangugage : "en",
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 -r1.5.2.1
--- lams_tool_bbb/web/WEB-INF/tags/CKEditor.tag 1 Apr 2014 16:57:46 -0000 1.5
+++ lams_tool_bbb/web/WEB-INF/tags/CKEditor.tag 3 Sep 2014 13:19:43 -0000 1.5.2.1
@@ -62,6 +62,7 @@
var instance = CKEDITOR.replace( "${id}", {
width : "${width}",
height : "${height}",
+ autoGrow_minHeight : "${height}".replace("px", ""),
toolbar : "${toolbarSet}",
language : "${language}",
defaultLangugage : "en",
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 -r1.14.2.1
--- lams_tool_chat/web/WEB-INF/tags/CKEditor.tag 1 Apr 2014 16:58:15 -0000 1.14
+++ lams_tool_chat/web/WEB-INF/tags/CKEditor.tag 3 Sep 2014 13:19:20 -0000 1.14.2.1
@@ -62,6 +62,7 @@
var instance = CKEDITOR.replace( "${id}", {
width : "${width}",
height : "${height}",
+ autoGrow_minHeight : "${height}".replace("px", ""),
toolbar : "${toolbarSet}",
language : "${language}",
defaultLangugage : "en",
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 -r1.14.2.1
--- lams_tool_daco/web/WEB-INF/tags/CKEditor.tag 1 Apr 2014 16:58:52 -0000 1.14
+++ lams_tool_daco/web/WEB-INF/tags/CKEditor.tag 3 Sep 2014 13:19:34 -0000 1.14.2.1
@@ -62,6 +62,7 @@
var instance = CKEDITOR.replace( "${id}", {
width : "${width}",
height : "${height}",
+ autoGrow_minHeight : "${height}".replace("px", ""),
toolbar : "${toolbarSet}",
language : "${language}",
defaultLangugage : "en",
Index: lams_tool_eadventure/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_eadventure/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.5 -r1.5.2.1
--- lams_tool_eadventure/web/WEB-INF/tags/CKEditor.tag 1 Apr 2014 16:59:37 -0000 1.5
+++ lams_tool_eadventure/web/WEB-INF/tags/CKEditor.tag 3 Sep 2014 13:19:45 -0000 1.5.2.1
@@ -62,6 +62,7 @@
var instance = CKEDITOR.replace( "${id}", {
width : "${width}",
height : "${height}",
+ autoGrow_minHeight : "${height}".replace("px", ""),
toolbar : "${toolbarSet}",
language : "${language}",
defaultLangugage : "en",
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 -r1.14.2.1
--- lams_tool_forum/web/WEB-INF/tags/CKEditor.tag 1 Apr 2014 16:59:59 -0000 1.14
+++ lams_tool_forum/web/WEB-INF/tags/CKEditor.tag 3 Sep 2014 13:19:30 -0000 1.14.2.1
@@ -62,6 +62,7 @@
var instance = CKEDITOR.replace( "${id}", {
width : "${width}",
height : "${height}",
+ autoGrow_minHeight : "${height}".replace("px", ""),
toolbar : "${toolbarSet}",
language : "${language}",
defaultLangugage : "en",
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 -r1.14.2.1
--- lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag 1 Apr 2014 17:00:19 -0000 1.14
+++ lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag 3 Sep 2014 13:19:35 -0000 1.14.2.1
@@ -62,6 +62,7 @@
var instance = CKEDITOR.replace( "${id}", {
width : "${width}",
height : "${height}",
+ autoGrow_minHeight : "${height}".replace("px", ""),
toolbar : "${toolbarSet}",
language : "${language}",
defaultLangugage : "en",
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 -r1.14.2.1
--- lams_tool_images/web/WEB-INF/tags/CKEditor.tag 1 Apr 2014 17:00:37 -0000 1.14
+++ lams_tool_images/web/WEB-INF/tags/CKEditor.tag 3 Sep 2014 13:19:54 -0000 1.14.2.1
@@ -62,6 +62,7 @@
var instance = CKEDITOR.replace( "${id}", {
width : "${width}",
height : "${height}",
+ autoGrow_minHeight : "${height}".replace("px", ""),
toolbar : "${toolbarSet}",
language : "${language}",
defaultLangugage : "en",
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 -r1.5.2.1
--- lams_tool_imscc/web/WEB-INF/tags/CKEditor.tag 1 Apr 2014 17:00:57 -0000 1.5
+++ lams_tool_imscc/web/WEB-INF/tags/CKEditor.tag 3 Sep 2014 13:19:25 -0000 1.5.2.1
@@ -62,6 +62,7 @@
var instance = CKEDITOR.replace( "${id}", {
width : "${width}",
height : "${height}",
+ autoGrow_minHeight : "${height}".replace("px", ""),
toolbar : "${toolbarSet}",
language : "${language}",
defaultLangugage : "en",
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 -r1.3.2.1
--- lams_tool_kaltura/web/WEB-INF/tags/CKEditor.tag 1 Apr 2014 17:01:15 -0000 1.3
+++ lams_tool_kaltura/web/WEB-INF/tags/CKEditor.tag 3 Sep 2014 13:19:33 -0000 1.3.2.1
@@ -62,6 +62,7 @@
var instance = CKEDITOR.replace( "${id}", {
width : "${width}",
height : "${height}",
+ autoGrow_minHeight : "${height}".replace("px", ""),
toolbar : "${toolbarSet}",
language : "${language}",
defaultLangugage : "en",
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 -r1.14.2.1
--- lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag 1 Apr 2014 17:01:40 -0000 1.14
+++ lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag 3 Sep 2014 13:19:41 -0000 1.14.2.1
@@ -62,6 +62,7 @@
var instance = CKEDITOR.replace( "${id}", {
width : "${width}",
height : "${height}",
+ autoGrow_minHeight : "${height}".replace("px", ""),
toolbar : "${toolbarSet}",
language : "${language}",
defaultLangugage : "en",
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 -r1.14.2.1
--- lams_tool_laqa/web/WEB-INF/tags/CKEditor.tag 1 Apr 2014 17:02:58 -0000 1.14
+++ lams_tool_laqa/web/WEB-INF/tags/CKEditor.tag 3 Sep 2014 13:19:48 -0000 1.14.2.1
@@ -62,6 +62,7 @@
var instance = CKEDITOR.replace( "${id}", {
width : "${width}",
height : "${height}",
+ autoGrow_minHeight : "${height}".replace("px", ""),
toolbar : "${toolbarSet}",
language : "${language}",
defaultLangugage : "en",
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 -r1.14.2.1
--- lams_tool_larsrc/web/WEB-INF/tags/CKEditor.tag 1 Apr 2014 17:03:21 -0000 1.14
+++ lams_tool_larsrc/web/WEB-INF/tags/CKEditor.tag 3 Sep 2014 13:19:52 -0000 1.14.2.1
@@ -62,6 +62,7 @@
var instance = CKEDITOR.replace( "${id}", {
width : "${width}",
height : "${height}",
+ autoGrow_minHeight : "${height}".replace("px", ""),
toolbar : "${toolbarSet}",
language : "${language}",
defaultLangugage : "en",
Index: lams_tool_leader/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_leader/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.1 -r1.1.2.1
--- lams_tool_leader/web/WEB-INF/tags/AuthoringButton.tag 8 Jan 2014 20:13:50 -0000 1.1
+++ lams_tool_leader/web/WEB-INF/tags/AuthoringButton.tag 3 Sep 2014 13:19:32 -0000 1.1.2.1
@@ -106,7 +106,7 @@
doAjaxCall(clearSessionUrl);
} else {
if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
- window.location.href = notifyCloseURL;
+ window.location.href = notifyCloseURL + '&action=' + nextAction;
} else if (window.parent.opener == null){
doAjaxCall(notifyCloseURL);
} else {
@@ -130,4 +130,4 @@