\ No newline at end of file
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.1 -r1.3.2.2
--- lams_tool_kaltura/web/WEB-INF/tags/CKEditor.tag 3 Sep 2014 13:19:33 -0000 1.3.2.1
+++ lams_tool_kaltura/web/WEB-INF/tags/CKEditor.tag 3 Jun 2016 08:58:43 -0000 1.3.2.2
@@ -10,7 +10,12 @@
<%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
<%@ attribute name="displayExpanded" required="false" rtexprvalue="true"%>
<%@ attribute name="resizeParentFrameName" required="false" rtexprvalue="true"%>
+<%@ attribute name="method" required="false" rtexprvalue="true"%>
+
+
+
+
@@ -19,6 +24,10 @@
+
+ ${toolbarSet}Replace
+
+
@@ -33,10 +42,10 @@
-
+
- ckeditor/
+ /lams/ckeditor/
@@ -59,10 +68,9 @@
var editor = CKEDITOR.instances["${id}"];
if (editor) { editor.destroy(true); }
- var instance = CKEDITOR.replace( "${id}", {
+ var instance = CKEDITOR.${method}( "${id}", {
width : "${width}",
height : "${height}",
- autoGrow_minHeight : "${height}".replace("px", ""),
toolbar : "${toolbarSet}",
language : "${language}",
defaultLangugage : "en",
Index: lams_tool_kaltura/web/WEB-INF/tags/ImgButtonWrapper.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_kaltura/web/WEB-INF/tags/ImgButtonWrapper.tag,v
diff -u -r1.1 -r1.1.2.1
--- lams_tool_kaltura/web/WEB-INF/tags/ImgButtonWrapper.tag 15 Nov 2012 14:39:27 -0000 1.1
+++ lams_tool_kaltura/web/WEB-INF/tags/ImgButtonWrapper.tag 3 Jun 2016 08:58:43 -0000 1.1.2.1
@@ -1,37 +1,37 @@
-<%
-/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- *
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
-
- /**
- * ImgButtonWrapper.tag
- * Author: Mitchell Seaton
- * Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
- */
-
- %>
-<%@ tag body-content="scriptless" %>
-
-
-
-
-
+<%
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+ /**
+ * ImgButtonWrapper.tag
+ * Author: Mitchell Seaton
+ * Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
+ */
+
+ %>
+<%@ tag body-content="scriptless" %>
+