Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java =================================================================== diff -u -re66bdae723516ab13d4a6f81e5f598018f6dbe58 -r8a0ce21a725377050cc155f9edb0edad71ac2fd4 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java (.../AuthoringAction.java) (revision e66bdae723516ab13d4a6f81e5f598018f6dbe58) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java (.../AuthoringAction.java) (revision 8a0ce21a725377050cc155f9edb0edad71ac2fd4) @@ -1075,6 +1075,8 @@ String command = WebUtil.readStrParam(request, AttributeNames.PARAM_COMMAND, true); if (command == null) { plannerForm.fillForm(forum); + String contentFolderId = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID); + plannerForm.setContentFolderID(contentFolderId); return mapping.findForward("success"); } else { try { Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumPedagogicalPlannerForm.java =================================================================== diff -u -r05db875c7974d705f89231416ff6dfe91a5e70f1 -r8a0ce21a725377050cc155f9edb0edad71ac2fd4 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumPedagogicalPlannerForm.java (.../ForumPedagogicalPlannerForm.java) (revision 05db875c7974d705f89231416ff6dfe91a5e70f1) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumPedagogicalPlannerForm.java (.../ForumPedagogicalPlannerForm.java) (revision 8a0ce21a725377050cc155f9edb0edad71ac2fd4) @@ -39,6 +39,7 @@ */ public class ForumPedagogicalPlannerForm extends PedagogicalPlannerForm { private List topic; + private String contentFolderID; @Override public ActionMessages validate() { @@ -107,4 +108,16 @@ topic.remove(number); return true; } + + public String getContentFolderID() { + return contentFolderID; + } + + public void setContentFolderID(String contentFolderID) { + this.contentFolderID = contentFolderID; + } + + public List getTopicList() { + return topic; + } } \ No newline at end of file Index: lams_tool_forum/web/jsps/authoring/pedagogicalPlannerForm.jsp =================================================================== diff -u -re66bdae723516ab13d4a6f81e5f598018f6dbe58 -r8a0ce21a725377050cc155f9edb0edad71ac2fd4 --- lams_tool_forum/web/jsps/authoring/pedagogicalPlannerForm.jsp (.../pedagogicalPlannerForm.jsp) (revision e66bdae723516ab13d4a6f81e5f598018f6dbe58) +++ lams_tool_forum/web/jsps/authoring/pedagogicalPlannerForm.jsp (.../pedagogicalPlannerForm.jsp) (revision 8a0ce21a725377050cc155f9edb0edad71ac2fd4) @@ -13,9 +13,13 @@ float: right; } - textarea { - margin: 5px 0px 0px 10px; + body{ + width: 550px; } + + div.FCKdiv { + margin-top: 10px; + } @@ -29,6 +33,18 @@ } }); } + function prepareFormData(){ + //FCKeditor content is not submitted when sending by jQuery; we need to do this + var topicIndex = 0; + do{ + var topic = document.getElementById("topic["+topicIndex+"]"); + if (topic!=null){ + var content = FCKeditorAPI.GetInstance("topic["+topicIndex+"]").GetXHTML(); + topic.value=content; + topicIndex++; + } + } while (topic!=null); + } @@ -42,7 +58,14 @@ - +
+ + +
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McPedagogicalPlannerAction.java =================================================================== diff -u -re66bdae723516ab13d4a6f81e5f598018f6dbe58 -r8a0ce21a725377050cc155f9edb0edad71ac2fd4 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McPedagogicalPlannerAction.java (.../McPedagogicalPlannerAction.java) (revision e66bdae723516ab13d4a6f81e5f598018f6dbe58) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McPedagogicalPlannerAction.java (.../McPedagogicalPlannerAction.java) (revision 8a0ce21a725377050cc155f9edb0edad71ac2fd4) @@ -73,6 +73,8 @@ String command = WebUtil.readStrParam(request, AttributeNames.PARAM_COMMAND, true); if (command == null) { plannerForm.fillForm(qaContent, getMcService()); + String contentFolderId = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID); + plannerForm.setContentFolderID(contentFolderId); return mapping.findForward(McAppConstants.SUCCESS); } else { try { Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McPedagogicalPlannerForm.java =================================================================== diff -u -r05db875c7974d705f89231416ff6dfe91a5e70f1 -r8a0ce21a725377050cc155f9edb0edad71ac2fd4 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McPedagogicalPlannerForm.java (.../McPedagogicalPlannerForm.java) (revision 05db875c7974d705f89231416ff6dfe91a5e70f1) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McPedagogicalPlannerForm.java (.../McPedagogicalPlannerForm.java) (revision 8a0ce21a725377050cc155f9edb0edad71ac2fd4) @@ -40,7 +40,6 @@ import org.lamsfoundation.lams.tool.mc.McQuestionContentDTO; import org.lamsfoundation.lams.tool.mc.pojos.McContent; import org.lamsfoundation.lams.tool.mc.service.IMcService; -import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.planner.PedagogicalPlannerForm; public class McPedagogicalPlannerForm extends PedagogicalPlannerForm { @@ -50,7 +49,16 @@ private List candidateAnswerCount; private String candidateAnswersString; private List correct; + private String contentFolderID; + public String getContentFolderID() { + return contentFolderID; + } + + public void setContentFolderID(String contentFolderID) { + this.contentFolderID = contentFolderID; + } + public ActionMessages validate(HttpServletRequest request) { ActionMessages errors = new ActionMessages(); boolean allEmpty = true; @@ -127,7 +135,7 @@ for (int questionIndex = 1; questionIndex <= questions.size(); questionIndex++) { McQuestionContentDTO item = questions.get(questionIndex - 1); int questionDisplayOrder = Integer.parseInt(item.getDisplayOrder()); - String questionText = WebUtil.removeHTMLtags(item.getQuestion()); + String questionText = item.getQuestion(); setQuestion(questionDisplayOrder - 1, questionText); List candidateAnswers = item.getListCandidateAnswersDTO(); @@ -234,4 +242,8 @@ this.candidateAnswerCount = candidateAnswerCount; } + + public List getQuestionList() { + return question; + } } \ No newline at end of file Index: lams_tool_lamc/web/authoring/pedagogicalPlannerForm.jsp =================================================================== diff -u -re66bdae723516ab13d4a6f81e5f598018f6dbe58 -r8a0ce21a725377050cc155f9edb0edad71ac2fd4 --- lams_tool_lamc/web/authoring/pedagogicalPlannerForm.jsp (.../pedagogicalPlannerForm.jsp) (revision e66bdae723516ab13d4a6f81e5f598018f6dbe58) +++ lams_tool_lamc/web/authoring/pedagogicalPlannerForm.jsp (.../pedagogicalPlannerForm.jsp) (revision 8a0ce21a725377050cc155f9edb0edad71ac2fd4) @@ -14,6 +14,14 @@ input { margin: 5px 0px 0px 10px; } + + body { + width: 550px; + } + + div.FCKdiv { + margin-top: 10px; + } @@ -29,6 +37,19 @@ }); } + function prepareFormData(){ + //FCKeditor content is not submitted when sending by jQuery; we need to do this + var questionIndex = 0; + do{ + var question = document.getElementById("question["+questionIndex+"]"); + if (question!=null){ + var content = FCKeditorAPI.GetInstance("question["+questionIndex+"]").GetXHTML(); + question.value=content; + questionIndex++; + } + } while (question!=null); + } + function fillForm(){ var candidateAnswersString = $("#candidateAnswersString").val(); @@ -50,6 +71,8 @@ $(document).ready(function(){ fillForm(); }); + + @@ -66,7 +89,14 @@ - +
+ + +
${candidateAnswerIndex}. Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaPedagogicalPlannerAction.java =================================================================== diff -u -re66bdae723516ab13d4a6f81e5f598018f6dbe58 -r8a0ce21a725377050cc155f9edb0edad71ac2fd4 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaPedagogicalPlannerAction.java (.../QaPedagogicalPlannerAction.java) (revision e66bdae723516ab13d4a6f81e5f598018f6dbe58) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaPedagogicalPlannerAction.java (.../QaPedagogicalPlannerAction.java) (revision 8a0ce21a725377050cc155f9edb0edad71ac2fd4) @@ -65,6 +65,8 @@ String command = WebUtil.readStrParam(request, AttributeNames.PARAM_COMMAND, true); if (command == null) { plannerForm.fillForm(qaContent); + String contentFolderId = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID); + plannerForm.setContentFolderID(contentFolderId); return mapping.findForward(QaAppConstants.SUCCESS); } else { try { Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaPedagogicalPlannerForm.java =================================================================== diff -u -r05db875c7974d705f89231416ff6dfe91a5e70f1 -r8a0ce21a725377050cc155f9edb0edad71ac2fd4 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaPedagogicalPlannerForm.java (.../QaPedagogicalPlannerForm.java) (revision 05db875c7974d705f89231416ff6dfe91a5e70f1) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaPedagogicalPlannerForm.java (.../QaPedagogicalPlannerForm.java) (revision 8a0ce21a725377050cc155f9edb0edad71ac2fd4) @@ -32,12 +32,20 @@ import org.apache.struts.action.ActionMessages; import org.lamsfoundation.lams.tool.qa.QaContent; import org.lamsfoundation.lams.tool.qa.QaQueContent; -import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.planner.PedagogicalPlannerForm; public class QaPedagogicalPlannerForm extends PedagogicalPlannerForm { private List question; + private String contentFolderID; + public String getContentFolderID() { + return contentFolderID; + } + + public void setContentFolderID(String contentFolderID) { + this.contentFolderID = contentFolderID; + } + @Override public ActionMessages validate() { ActionMessages errors = new ActionMessages(); @@ -71,7 +79,7 @@ if (questions != null) { int topicIndex = 0; for (QaQueContent message : (Set) questions) { - setQuestion(topicIndex++, WebUtil.removeHTMLtags(message.getQuestion())); + setQuestion(topicIndex++, message.getQuestion()); } } } @@ -105,4 +113,8 @@ question.remove(number); return true; } + + public List getQuestionList() { + return question; + } } \ No newline at end of file Index: lams_tool_laqa/web/WEB-INF/tags/FCKEditor.tag =================================================================== diff -u -ra7d315d543efd3ef2a1b85de373fc3336b59e647 -r8a0ce21a725377050cc155f9edb0edad71ac2fd4 --- lams_tool_laqa/web/WEB-INF/tags/FCKEditor.tag (.../FCKEditor.tag) (revision a7d315d543efd3ef2a1b85de373fc3336b59e647) +++ lams_tool_laqa/web/WEB-INF/tags/FCKEditor.tag (.../FCKEditor.tag) (revision 8a0ce21a725377050cc155f9edb0edad71ac2fd4) @@ -1,74 +1,74 @@ -<%@ taglib uri="tags-core" prefix="c"%> -<%@ taglib uri="tags-lams" prefix="lams"%> -<%@ taglib uri="fck-editor" prefix="fck"%> - -<%@ attribute name="id" required="true" rtexprvalue="true"%> -<%@ attribute name="value" required="true" rtexprvalue="true"%> -<%@ attribute name="toolbarSet" required="false" rtexprvalue="true"%> -<%@ attribute name="height" required="false" rtexprvalue="true"%> -<%@ attribute name="width" required="false" rtexprvalue="true"%> -<%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%> -<%@ attribute name="displayExpanded" required="false" rtexprvalue="true"%> - - - - - - - - - - - - - - - - - - -/fckeditor/ - - - - - ${value} - - - - - +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-lams" prefix="lams"%> +<%@ taglib uri="fck-editor" prefix="fck"%> + +<%@ attribute name="id" required="true" rtexprvalue="true"%> +<%@ attribute name="value" required="true" rtexprvalue="true"%> +<%@ attribute name="toolbarSet" required="false" rtexprvalue="true"%> +<%@ attribute name="height" required="false" rtexprvalue="true"%> +<%@ attribute name="width" required="false" rtexprvalue="true"%> +<%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%> +<%@ attribute name="displayExpanded" required="false" rtexprvalue="true"%> + + + + + + + + + + + + + + + + + + +/fckeditor/ + + + + + ${value} + + + + + Index: lams_tool_laqa/web/authoring/pedagogicalPlannerForm.jsp =================================================================== diff -u -re66bdae723516ab13d4a6f81e5f598018f6dbe58 -r8a0ce21a725377050cc155f9edb0edad71ac2fd4 --- lams_tool_laqa/web/authoring/pedagogicalPlannerForm.jsp (.../pedagogicalPlannerForm.jsp) (revision e66bdae723516ab13d4a6f81e5f598018f6dbe58) +++ lams_tool_laqa/web/authoring/pedagogicalPlannerForm.jsp (.../pedagogicalPlannerForm.jsp) (revision 8a0ce21a725377050cc155f9edb0edad71ac2fd4) @@ -11,9 +11,13 @@ float: right; } - textarea { - margin: 5px 0px 0px 10px; + body { + width: 550px; } + + div.FCKdiv { + margin-top: 10px; + } @@ -27,6 +31,19 @@ } }); } + + function prepareFormData(){ + //FCKeditor content is not submitted when sending by jQuery; we need to do this + var questionIndex = 0; + do{ + var question = document.getElementById("question["+questionIndex+"]"); + if (question!=null){ + var content = FCKeditorAPI.GetInstance("question["+questionIndex+"]").GetXHTML(); + question.value=content; + questionIndex++; + } + } while (question!=null); + } @@ -40,7 +57,14 @@ - +
+ + +
Index: lams_tool_larsrc/web/pages/authoring/pedagogicalPlannerForm.jsp =================================================================== diff -u -re66bdae723516ab13d4a6f81e5f598018f6dbe58 -r8a0ce21a725377050cc155f9edb0edad71ac2fd4 --- lams_tool_larsrc/web/pages/authoring/pedagogicalPlannerForm.jsp (.../pedagogicalPlannerForm.jsp) (revision e66bdae723516ab13d4a6f81e5f598018f6dbe58) +++ lams_tool_larsrc/web/pages/authoring/pedagogicalPlannerForm.jsp (.../pedagogicalPlannerForm.jsp) (revision 8a0ce21a725377050cc155f9edb0edad71ac2fd4) @@ -45,7 +45,7 @@ <%@ include file="/common/messages.jsp"%> - + @@ -59,18 +59,18 @@

- +

- +

: ${itemFileName}

- +
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbPedagogicalPlannerAction.java =================================================================== diff -u -re66bdae723516ab13d4a6f81e5f598018f6dbe58 -r8a0ce21a725377050cc155f9edb0edad71ac2fd4 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbPedagogicalPlannerAction.java (.../NbPedagogicalPlannerAction.java) (revision e66bdae723516ab13d4a6f81e5f598018f6dbe58) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbPedagogicalPlannerAction.java (.../NbPedagogicalPlannerAction.java) (revision 8a0ce21a725377050cc155f9edb0edad71ac2fd4) @@ -76,6 +76,8 @@ String command = WebUtil.readStrParam(request, AttributeNames.PARAM_COMMAND, true); if (command == null) { plannerForm.fillForm(noticeboard); + String contentFolderId = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID); + plannerForm.setContentFolderID(contentFolderId); return mapping.findForward("success"); } else { try { Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbPedagogicalPlannerForm.java =================================================================== diff -u -r05db875c7974d705f89231416ff6dfe91a5e70f1 -r8a0ce21a725377050cc155f9edb0edad71ac2fd4 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbPedagogicalPlannerForm.java (.../NbPedagogicalPlannerForm.java) (revision 05db875c7974d705f89231416ff6dfe91a5e70f1) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbPedagogicalPlannerForm.java (.../NbPedagogicalPlannerForm.java) (revision 8a0ce21a725377050cc155f9edb0edad71ac2fd4) @@ -24,16 +24,24 @@ package org.lamsfoundation.lams.tool.noticeboard.web; import org.lamsfoundation.lams.tool.noticeboard.NoticeboardContent; -import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.planner.PedagogicalPlannerForm; /** * @struts:form name="NbPedagogicalPlannerForm" * type="org.lamsfoundation.lams.tool.noticeboard.web.NbPedagogicalPlannerForm" */ public class NbPedagogicalPlannerForm extends PedagogicalPlannerForm { - String content; + private String content; + private String contentFolderID; + public String getContentFolderID() { + return contentFolderID; + } + + public void setContentFolderID(String contentFolderID) { + this.contentFolderID = contentFolderID; + } + public String getContent() { return content; } @@ -45,7 +53,6 @@ public void fillForm(NoticeboardContent noticeboard) { if (noticeboard != null) { String content = noticeboard.getContent(); - content = WebUtil.removeHTMLtags(content); setContent(content); setToolContentID(noticeboard.getNbContentId()); } Index: lams_tool_nb/web/authoring/pedagogicalPlannerForm.jsp =================================================================== diff -u -re66bdae723516ab13d4a6f81e5f598018f6dbe58 -r8a0ce21a725377050cc155f9edb0edad71ac2fd4 --- lams_tool_nb/web/authoring/pedagogicalPlannerForm.jsp (.../pedagogicalPlannerForm.jsp) (revision e66bdae723516ab13d4a6f81e5f598018f6dbe58) +++ lams_tool_nb/web/authoring/pedagogicalPlannerForm.jsp (.../pedagogicalPlannerForm.jsp) (revision 8a0ce21a725377050cc155f9edb0edad71ac2fd4) @@ -5,15 +5,30 @@ + + - +

- + + + + \ No newline at end of file Index: lams_tool_notebook/web/pages/authoring/pedagogicalPlannerForm.jsp =================================================================== diff -u -rd9ef7dd5b3120f587f24276bfcfba455ae2c4e80 -r8a0ce21a725377050cc155f9edb0edad71ac2fd4 --- lams_tool_notebook/web/pages/authoring/pedagogicalPlannerForm.jsp (.../pedagogicalPlannerForm.jsp) (revision d9ef7dd5b3120f587f24276bfcfba455ae2c4e80) +++ lams_tool_notebook/web/pages/authoring/pedagogicalPlannerForm.jsp (.../pedagogicalPlannerForm.jsp) (revision 8a0ce21a725377050cc155f9edb0edad71ac2fd4) @@ -14,7 +14,7 @@ } - + <%@ include file="/common/messages.jsp"%>

@@ -28,8 +28,8 @@ + toolbarSet="Custom-Pedplanner" height="150px" + width="545px" displayExpanded="false"> Index: lams_tool_sbmt/web/authoring/pedagogicalPlannerForm.jsp =================================================================== diff -u -rd9ef7dd5b3120f587f24276bfcfba455ae2c4e80 -r8a0ce21a725377050cc155f9edb0edad71ac2fd4 --- lams_tool_sbmt/web/authoring/pedagogicalPlannerForm.jsp (.../pedagogicalPlannerForm.jsp) (revision d9ef7dd5b3120f587f24276bfcfba455ae2c4e80) +++ lams_tool_sbmt/web/authoring/pedagogicalPlannerForm.jsp (.../pedagogicalPlannerForm.jsp) (revision 8a0ce21a725377050cc155f9edb0edad71ac2fd4) @@ -14,7 +14,7 @@ } - +

@@ -26,8 +26,8 @@ + toolbarSet="Custom-Pedplanner" height="150px" + width="545px" displayExpanded="false"> Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VotePedagogicalPlannerAction.java =================================================================== diff -u -re66bdae723516ab13d4a6f81e5f598018f6dbe58 -r8a0ce21a725377050cc155f9edb0edad71ac2fd4 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VotePedagogicalPlannerAction.java (.../VotePedagogicalPlannerAction.java) (revision e66bdae723516ab13d4a6f81e5f598018f6dbe58) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VotePedagogicalPlannerAction.java (.../VotePedagogicalPlannerAction.java) (revision 8a0ce21a725377050cc155f9edb0edad71ac2fd4) @@ -65,6 +65,8 @@ String command = WebUtil.readStrParam(request, AttributeNames.PARAM_COMMAND, true); if (command == null) { plannerForm.fillForm(voteContent); + String contentFolderId = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID); + plannerForm.setContentFolderID(contentFolderId); return mapping.findForward(VoteAppConstants.SUCCESS); } else { try { Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VotePedagogicalPlannerForm.java =================================================================== diff -u -r05db875c7974d705f89231416ff6dfe91a5e70f1 -r8a0ce21a725377050cc155f9edb0edad71ac2fd4 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VotePedagogicalPlannerForm.java (.../VotePedagogicalPlannerForm.java) (revision 05db875c7974d705f89231416ff6dfe91a5e70f1) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VotePedagogicalPlannerForm.java (.../VotePedagogicalPlannerForm.java) (revision 8a0ce21a725377050cc155f9edb0edad71ac2fd4) @@ -32,12 +32,20 @@ import org.apache.struts.action.ActionMessages; import org.lamsfoundation.lams.tool.vote.pojos.VoteContent; import org.lamsfoundation.lams.tool.vote.pojos.VoteQueContent; -import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.planner.PedagogicalPlannerForm; public class VotePedagogicalPlannerForm extends PedagogicalPlannerForm { private List nomination; + private String contentFolderID; + public String getContentFolderID() { + return contentFolderID; + } + + public void setContentFolderID(String contentFolderID) { + this.contentFolderID = contentFolderID; + } + @Override public ActionMessages validate() { ActionMessages errors = new ActionMessages(); @@ -71,7 +79,7 @@ if (questions != null) { int topicIndex = 0; for (VoteQueContent message : (Set) questions) { - setNomination(topicIndex++, WebUtil.removeHTMLtags(message.getQuestion())); + setNomination(topicIndex++, message.getQuestion()); } } } @@ -105,4 +113,8 @@ nomination.remove(number); return true; } + + public List getNominationList() { + return nomination; + } } \ No newline at end of file Index: lams_tool_vote/web/WEB-INF/tags/FCKEditor.tag =================================================================== diff -u -ra7d315d543efd3ef2a1b85de373fc3336b59e647 -r8a0ce21a725377050cc155f9edb0edad71ac2fd4 --- lams_tool_vote/web/WEB-INF/tags/FCKEditor.tag (.../FCKEditor.tag) (revision a7d315d543efd3ef2a1b85de373fc3336b59e647) +++ lams_tool_vote/web/WEB-INF/tags/FCKEditor.tag (.../FCKEditor.tag) (revision 8a0ce21a725377050cc155f9edb0edad71ac2fd4) @@ -1,74 +1,74 @@ -<%@ taglib uri="tags-core" prefix="c"%> -<%@ taglib uri="tags-lams" prefix="lams"%> -<%@ taglib uri="fck-editor" prefix="fck"%> - -<%@ attribute name="id" required="true" rtexprvalue="true"%> -<%@ attribute name="value" required="true" rtexprvalue="true"%> -<%@ attribute name="toolbarSet" required="false" rtexprvalue="true"%> -<%@ attribute name="height" required="false" rtexprvalue="true"%> -<%@ attribute name="width" required="false" rtexprvalue="true"%> -<%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%> -<%@ attribute name="displayExpanded" required="false" rtexprvalue="true"%> - - - - - - - - - - - - - - - - - - -/fckeditor/ - - - - - ${value} - - - - - +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-lams" prefix="lams"%> +<%@ taglib uri="fck-editor" prefix="fck"%> + +<%@ attribute name="id" required="true" rtexprvalue="true"%> +<%@ attribute name="value" required="true" rtexprvalue="true"%> +<%@ attribute name="toolbarSet" required="false" rtexprvalue="true"%> +<%@ attribute name="height" required="false" rtexprvalue="true"%> +<%@ attribute name="width" required="false" rtexprvalue="true"%> +<%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%> +<%@ attribute name="displayExpanded" required="false" rtexprvalue="true"%> + + + + + + + + + + + + + + + + + + +/fckeditor/ + + + + + ${value} + + + + + Index: lams_tool_vote/web/authoring/pedagogicalPlannerForm.jsp =================================================================== diff -u -re66bdae723516ab13d4a6f81e5f598018f6dbe58 -r8a0ce21a725377050cc155f9edb0edad71ac2fd4 --- lams_tool_vote/web/authoring/pedagogicalPlannerForm.jsp (.../pedagogicalPlannerForm.jsp) (revision e66bdae723516ab13d4a6f81e5f598018f6dbe58) +++ lams_tool_vote/web/authoring/pedagogicalPlannerForm.jsp (.../pedagogicalPlannerForm.jsp) (revision 8a0ce21a725377050cc155f9edb0edad71ac2fd4) @@ -11,9 +11,13 @@ float: right; } - textarea { - margin: 5px 0px 0px 10px; + body { + width: 550px; } + + div.FCKdiv { + margin-top: 5px; + } @@ -27,6 +31,19 @@ } }); } + + function prepareFormData(){ + //FCKeditor content is not submitted when sending by jQuery; we need to do this + var nominationIndex = 0; + do{ + var nomination = document.getElementById("nomination["+nominationIndex+"]"); + if (nomination!=null){ + var content = FCKeditorAPI.GetInstance("nomination["+nominationIndex+"]").GetXHTML(); + nomination.value=content; + nominationIndex++; + } + } while (nomination!=null); + } @@ -40,7 +57,14 @@ - +
+ + +
Index: lams_tool_wiki/web/pages/authoring/pedagogicalPlannerForm.jsp =================================================================== diff -u -r8d32e52903d230f8018ac609041934db7f180e73 -r8a0ce21a725377050cc155f9edb0edad71ac2fd4 --- lams_tool_wiki/web/pages/authoring/pedagogicalPlannerForm.jsp (.../pedagogicalPlannerForm.jsp) (revision 8d32e52903d230f8018ac609041934db7f180e73) +++ lams_tool_wiki/web/pages/authoring/pedagogicalPlannerForm.jsp (.../pedagogicalPlannerForm.jsp) (revision 8a0ce21a725377050cc155f9edb0edad71ac2fd4) @@ -10,6 +10,10 @@ margin: 5px 0px 5px 10px; float: none; } + + body { + width: 550px; + }