Index: lams_tool_forum/web/jsps/authoring/basic.jsp =================================================================== diff -u -rdb44c0602e8fa1b68b2ebce18a58a3d8215cc61b -r7db98069c542476a8a3aea28e0822b751e120085 --- lams_tool_forum/web/jsps/authoring/basic.jsp (.../basic.jsp) (revision db44c0602e8fa1b68b2ebce18a58a3d8215cc61b) +++ lams_tool_forum/web/jsps/authoring/basic.jsp (.../basic.jsp) (revision 7db98069c542476a8a3aea28e0822b751e120085) @@ -133,6 +133,7 @@ +
@@ -143,7 +144,8 @@ ');" class="button-add-item"> + key="label.authoring.create.new.topic" /> +

@@ -154,5 +156,3 @@ scrolling="no">

- - Index: lams_tool_forum/web/jsps/authoring/message/create.jsp =================================================================== diff -u -r380104a5c34302baf1b40fd2c3ea059eeb1e3a03 -r7db98069c542476a8a3aea28e0822b751e120085 --- lams_tool_forum/web/jsps/authoring/message/create.jsp (.../create.jsp) (revision 380104a5c34302baf1b40fd2c3ea059eeb1e3a03) +++ lams_tool_forum/web/jsps/authoring/message/create.jsp (.../create.jsp) (revision 7db98069c542476a8a3aea28e0822b751e120085) @@ -1,23 +1,33 @@ - + <%@ include file="/common/taglibs.jsp"%> <%@ include file="/common/header.jsp"%> + + + + <%@ include file="/common/messages.jsp"%> - + - - + +
Index: lams_tool_forum/web/jsps/authoring/message/edit.jsp =================================================================== diff -u -r380104a5c34302baf1b40fd2c3ea059eeb1e3a03 -r7db98069c542476a8a3aea28e0822b751e120085 --- lams_tool_forum/web/jsps/authoring/message/edit.jsp (.../edit.jsp) (revision 380104a5c34302baf1b40fd2c3ea059eeb1e3a03) +++ lams_tool_forum/web/jsps/authoring/message/edit.jsp (.../edit.jsp) (revision 7db98069c542476a8a3aea28e0822b751e120085) @@ -1,5 +1,4 @@ - + <%@ include file="/common/taglibs.jsp"%> @@ -10,23 +9,30 @@ var removeItemAttachmentUrl = ""; - + + + <%@ include file="/common/messages.jsp"%> - - "> + + "> - - + +
@@ -41,8 +47,7 @@ *
- +
+ + + @@ -46,8 +60,7 @@
- +
<%@ include file="/pages/authoring/parts/imagefile.jsp"%>
Index: lams_tool_laqa/web/authoring/editQuestionBox.jsp =================================================================== diff -u -ra7661f206a3f21114f1c05f9a29f56e20f5e35f0 -r7db98069c542476a8a3aea28e0822b751e120085 --- lams_tool_laqa/web/authoring/editQuestionBox.jsp (.../editQuestionBox.jsp) (revision a7661f206a3f21114f1c05f9a29f56e20f5e35f0) +++ lams_tool_laqa/web/authoring/editQuestionBox.jsp (.../editQuestionBox.jsp) (revision 7db98069c542476a8a3aea28e0822b751e120085) @@ -6,6 +6,7 @@ <%@ include file="/common/header.jsp"%> + @@ -39,7 +50,7 @@ + contentFolderID="${qaGeneralAuthoringDTO.contentFolderID}" width="99%">
Index: lams_tool_laqa/web/authoring/newQuestionBox.jsp =================================================================== diff -u -r2357c59f32887145d7b1d281f57b9a3b60dd359c -r7db98069c542476a8a3aea28e0822b751e120085 --- lams_tool_laqa/web/authoring/newQuestionBox.jsp (.../newQuestionBox.jsp) (revision 2357c59f32887145d7b1d281f57b9a3b60dd359c) +++ lams_tool_laqa/web/authoring/newQuestionBox.jsp (.../newQuestionBox.jsp) (revision 7db98069c542476a8a3aea28e0822b751e120085) @@ -20,6 +20,16 @@ document.QaAuthoringForm.submit(); } + $(function() { + //change size of an iframe on ckeditor's autogrow + CKEDITOR.instances.newQuestion.on("instanceReady", function(e) { + e.editor.on('resize',function(reEvent){ + var iframe = window.parent.document.getElementById("messageArea"); + iframe.style.height=eval(iframe.contentWindow.document.body.scrollHeight)+'px'; + }); + }); + }); + @@ -176,7 +186,7 @@ + contentFolderID="${qaGeneralAuthoringDTO.contentFolderID}" width="99%">
- - Index: lams_tool_scribe/web/pages/authoring/headingForm.jsp =================================================================== diff -u -rc2ba0dc3e2d99441897de8d185e83c419a416f2d -r7db98069c542476a8a3aea28e0822b751e120085 --- lams_tool_scribe/web/pages/authoring/headingForm.jsp (.../headingForm.jsp) (revision c2ba0dc3e2d99441897de8d185e83c419a416f2d) +++ lams_tool_scribe/web/pages/authoring/headingForm.jsp (.../headingForm.jsp) (revision 7db98069c542476a8a3aea28e0822b751e120085) @@ -1,6 +1,17 @@ <%@ include file="/common/taglibs.jsp"%> + + + - - - - - Index: lams_tool_survey/web/pages/authoring/parts/addopenquestion.jsp =================================================================== diff -u -r2c033d93137546b6df85ab5c5edc6ee524700ff8 -r7db98069c542476a8a3aea28e0822b751e120085 --- lams_tool_survey/web/pages/authoring/parts/addopenquestion.jsp (.../addopenquestion.jsp) (revision 2c033d93137546b6df85ab5c5edc6ee524700ff8) +++ lams_tool_survey/web/pages/authoring/parts/addopenquestion.jsp (.../addopenquestion.jsp) (revision 7db98069c542476a8a3aea28e0822b751e120085) @@ -15,18 +15,30 @@ var addInstructionUrl = ""; + + + + <%@ include file="/common/messages.jsp"%> - - + + Index: lams_tool_task/web/pages/authoring/parts/addtask.jsp =================================================================== diff -u -r77bcef245dda8b166cdf40c12c62a7a5ab8d6fde -r7db98069c542476a8a3aea28e0822b751e120085 --- lams_tool_task/web/pages/authoring/parts/addtask.jsp (.../addtask.jsp) (revision 77bcef245dda8b166cdf40c12c62a7a5ab8d6fde) +++ lams_tool_task/web/pages/authoring/parts/addtask.jsp (.../addtask.jsp) (revision 7db98069c542476a8a3aea28e0822b751e120085) @@ -1,8 +1,8 @@ - + <%@ include file="/common/taglibs.jsp"%> - + Index: lams_tool_vote/web/authoring/editNominationBox.jsp =================================================================== diff -u -r5b17b810b5302c90b2daf6a5866bf4f6e85bef6a -r7db98069c542476a8a3aea28e0822b751e120085 --- lams_tool_vote/web/authoring/editNominationBox.jsp (.../editNominationBox.jsp) (revision 5b17b810b5302c90b2daf6a5866bf4f6e85bef6a) +++ lams_tool_vote/web/authoring/editNominationBox.jsp (.../editNominationBox.jsp) (revision 7db98069c542476a8a3aea28e0822b751e120085) @@ -3,13 +3,23 @@ <%@ include file="/common/header.jsp"%> + + - + @@ -19,7 +29,6 @@ -
@@ -30,7 +39,6 @@ contentFolderID="${voteGeneralAuthoringDTO.contentFolderID}" resizeParentFrameName="messageArea"> - - Index: lams_tool_vote/web/authoring/newNominationBox.jsp =================================================================== diff -u -r5b17b810b5302c90b2daf6a5866bf4f6e85bef6a -r7db98069c542476a8a3aea28e0822b751e120085 --- lams_tool_vote/web/authoring/newNominationBox.jsp (.../newNominationBox.jsp) (revision 5b17b810b5302c90b2daf6a5866bf4f6e85bef6a) +++ lams_tool_vote/web/authoring/newNominationBox.jsp (.../newNominationBox.jsp) (revision 7db98069c542476a8a3aea28e0822b751e120085) @@ -1,11 +1,22 @@ - + <%@ include file="/common/taglibs.jsp"%> <%@ include file="/common/header.jsp"%> + + Index: lams_tool_vote/web/common/header.jsp =================================================================== diff -u -r00ae80d4791f903bcb3661537fc7e129c72ad195 -r7db98069c542476a8a3aea28e0822b751e120085 --- lams_tool_vote/web/common/header.jsp (.../header.jsp) (revision 00ae80d4791f903bcb3661537fc7e129c72ad195) +++ lams_tool_vote/web/common/header.jsp (.../header.jsp) (revision 7db98069c542476a8a3aea28e0822b751e120085) @@ -19,7 +19,7 @@ - + Index: lams_tool_vote/web/monitoring/VoteNominationViewer.jsp =================================================================== diff -u -rfeeeaf3a7e4dafabc089483210f5bb223bc5b3ef -r7db98069c542476a8a3aea28e0822b751e120085 --- lams_tool_vote/web/monitoring/VoteNominationViewer.jsp (.../VoteNominationViewer.jsp) (revision feeeaf3a7e4dafabc089483210f5bb223bc5b3ef) +++ lams_tool_vote/web/monitoring/VoteNominationViewer.jsp (.../VoteNominationViewer.jsp) (revision 7db98069c542476a8a3aea28e0822b751e120085) @@ -8,7 +8,6 @@ <fmt:message key="label.learnersVoted"/> <%@ include file="/common/header.jsp"%> -