Index: lams_tool_nb/.classpath =================================================================== diff -u -r9218936edd87260de73e773054cb605a336133b1 -rec1390884180d267f85d5acc4f84fc2b3a990b5c --- lams_tool_nb/.classpath (.../.classpath) (revision 9218936edd87260de73e773054cb605a336133b1) +++ lams_tool_nb/.classpath (.../.classpath) (revision ec1390884180d267f85d5acc4f84fc2b3a990b5c) @@ -3,7 +3,7 @@ - + Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/form/NbAuthoringForm.java =================================================================== diff -u -r500ae45f4243aa718eac7436bc903b4f137a3aa7 -rec1390884180d267f85d5acc4f84fc2b3a990b5c --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/form/NbAuthoringForm.java (.../NbAuthoringForm.java) (revision 500ae45f4243aa718eac7436bc903b4f137a3aa7) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/form/NbAuthoringForm.java (.../NbAuthoringForm.java) (revision ec1390884180d267f85d5acc4f84fc2b3a990b5c) @@ -21,31 +21,33 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.noticeboard.web.form; import java.util.Date; import javax.servlet.http.HttpServletRequest; import org.apache.log4j.Logger; -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionMapping; import org.lamsfoundation.lams.tool.noticeboard.NoticeboardContent; /** - *

ActionForm which holds the state of the noticeboard form content in the Authoring - * environment. Stores all values in the session scope.

+ *

+ * ActionForm which holds the state of the noticeboard form content in the Authoring + * environment. Stores all values in the session scope. + *

* - *

The validate method does not check whether any of the input from + *

+ * The validate method does not check whether any of the input from * title, content are empty or not. * This is because I have encountered a situation where even though the field is - * empty, the FCKEditor places a
tag and so the validate method doesnt work. + * empty, the FCKEditor places a
+ * tag and so the validate method doesnt work. * However, the validate method checks the length of the file that has been uploaded, - * the maximum filesize that can be uploaded is a property that is in the UploadFileUtil.

+ * the maximum filesize that can be uploaded is a property that is in the UploadFileUtil. + *

* */ -public class NbAuthoringForm extends ActionForm { +public class NbAuthoringForm { private static final long serialVersionUID = -8425012664714570196L; @@ -184,24 +186,23 @@ } /** - * + * * @return Returns the contentFolderID */ public String getContentFolderID() { return contentFolderID; } /** - * + * * @param contentFolderID * The contentFolderID is set */ public void setContentFolderID(String contentFolderID) { this.contentFolderID = contentFolderID; } - @Override - public void reset(ActionMapping mapping, HttpServletRequest request) { + public void reset(HttpServletRequest request) { // this.content = null; //this.title = null; this.method = null; @@ -211,7 +212,7 @@ /** * This method is to prepopulate the form with values from a noticeboard content * object. Used in AuthoringStarterAction - * + * * @param nbContent */ public void populateFormWithNbContentValues(NoticeboardContent nbContent) { @@ -243,5 +244,4 @@ this.currentTab = currentTab; } - } \ No newline at end of file Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/form/NbLearnerForm.java =================================================================== diff -u -r983160690fed1d94b51c2ea9206c58093a29040d -rec1390884180d267f85d5acc4f84fc2b3a990b5c --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/form/NbLearnerForm.java (.../NbLearnerForm.java) (revision 983160690fed1d94b51c2ea9206c58093a29040d) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/form/NbLearnerForm.java (.../NbLearnerForm.java) (revision ec1390884180d267f85d5acc4f84fc2b3a990b5c) @@ -21,24 +21,22 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.noticeboard.web.form; import org.apache.log4j.Logger; -import org.apache.struts.action.ActionForm; import org.lamsfoundation.lams.tool.noticeboard.NoticeboardContent; /** * Creation Date: 19-05-05 - * * * * * * + * */ -public class NbLearnerForm extends ActionForm { +public class NbLearnerForm { private static final long serialVersionUID = -669035956406254875L; Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/form/NbMonitoringForm.java =================================================================== diff -u -r983160690fed1d94b51c2ea9206c58093a29040d -rec1390884180d267f85d5acc4f84fc2b3a990b5c --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/form/NbMonitoringForm.java (.../NbMonitoringForm.java) (revision 983160690fed1d94b51c2ea9206c58093a29040d) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/form/NbMonitoringForm.java (.../NbMonitoringForm.java) (revision ec1390884180d267f85d5acc4f84fc2b3a990b5c) @@ -21,21 +21,18 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.noticeboard.web.form; import java.util.Map; import javax.servlet.http.HttpServletRequest; import org.apache.log4j.Logger; -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionMapping; /** * @author mtruong */ -public class NbMonitoringForm extends ActionForm { +public class NbMonitoringForm { private static final long serialVersionUID = 6958826482877304278L; @@ -84,8 +81,7 @@ this.toolContentID = toolContentId; } - @Override - public void reset(ActionMapping mapping, HttpServletRequest request) { + public void reset(HttpServletRequest request) { this.method = null; } Fisheye: Tag ec1390884180d267f85d5acc4f84fc2b3a990b5c refers to a dead (removed) revision in file `lams_tool_nb/web/WEB-INF/struts-config.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_nb/web/WEB-INF/tags/TabBody.tag =================================================================== diff -u -r36e474218e1201198ba926e57e56c7a885db1a9f -rec1390884180d267f85d5acc4f84fc2b3a990b5c --- lams_tool_nb/web/WEB-INF/tags/TabBody.tag (.../TabBody.tag) (revision 36e474218e1201198ba926e57e56c7a885db1a9f) +++ lams_tool_nb/web/WEB-INF/tags/TabBody.tag (.../TabBody.tag) (revision ec1390884180d267f85d5acc4f84fc2b3a990b5c) @@ -34,7 +34,6 @@ <%@ attribute name="titleKey" required="false" rtexprvalue="true"%> <%@ attribute name="page" required="false" rtexprvalue="true"%> <%@ taglib uri="tags-core" prefix="c"%> -<%@ taglib uri="tags-bean" prefix="bean"%> Index: lams_tool_nb/web/WEB-INF/tags/TabBodyArea.tag =================================================================== diff -u -r0f43a76093ebdfc8dfde3de70990efbe5cad56ee -rec1390884180d267f85d5acc4f84fc2b3a990b5c --- lams_tool_nb/web/WEB-INF/tags/TabBodyArea.tag (.../TabBodyArea.tag) (revision 0f43a76093ebdfc8dfde3de70990efbe5cad56ee) +++ lams_tool_nb/web/WEB-INF/tags/TabBodyArea.tag (.../TabBodyArea.tag) (revision ec1390884180d267f85d5acc4f84fc2b3a990b5c) @@ -30,7 +30,6 @@ %> <%@ taglib uri="tags-core" prefix="c"%> -<%@ taglib uri="tags-bean" prefix="bean"%>
Fisheye: Tag ec1390884180d267f85d5acc4f84fc2b3a990b5c refers to a dead (removed) revision in file `lams_tool_nb/web/WEB-INF/tiles-defs.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ec1390884180d267f85d5acc4f84fc2b3a990b5c refers to a dead (removed) revision in file `lams_tool_nb/web/WEB-INF/tlds/struts/struts-bean-el.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ec1390884180d267f85d5acc4f84fc2b3a990b5c refers to a dead (removed) revision in file `lams_tool_nb/web/WEB-INF/tlds/struts/struts-bean.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ec1390884180d267f85d5acc4f84fc2b3a990b5c refers to a dead (removed) revision in file `lams_tool_nb/web/WEB-INF/tlds/struts/struts-html-el.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ec1390884180d267f85d5acc4f84fc2b3a990b5c refers to a dead (removed) revision in file `lams_tool_nb/web/WEB-INF/tlds/struts/struts-html.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ec1390884180d267f85d5acc4f84fc2b3a990b5c refers to a dead (removed) revision in file `lams_tool_nb/web/WEB-INF/tlds/struts/struts-logic-el.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ec1390884180d267f85d5acc4f84fc2b3a990b5c refers to a dead (removed) revision in file `lams_tool_nb/web/WEB-INF/tlds/struts/struts-logic.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ec1390884180d267f85d5acc4f84fc2b3a990b5c refers to a dead (removed) revision in file `lams_tool_nb/web/WEB-INF/tlds/struts/struts-nested.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ec1390884180d267f85d5acc4f84fc2b3a990b5c refers to a dead (removed) revision in file `lams_tool_nb/web/WEB-INF/tlds/struts/struts-tiles-el.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ec1390884180d267f85d5acc4f84fc2b3a990b5c refers to a dead (removed) revision in file `lams_tool_nb/web/WEB-INF/tlds/struts/struts-tiles.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ec1390884180d267f85d5acc4f84fc2b3a990b5c refers to a dead (removed) revision in file `lams_tool_nb/web/WEB-INF/validator-rules.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_nb/web/WEB-INF/web.xml =================================================================== diff -u -re998cf2de8c4714022559cb5f67e61b677a2dd28 -rec1390884180d267f85d5acc4f84fc2b3a990b5c --- lams_tool_nb/web/WEB-INF/web.xml (.../web.xml) (revision e998cf2de8c4714022559cb5f67e61b677a2dd28) +++ lams_tool_nb/web/WEB-INF/web.xml (.../web.xml) (revision ec1390884180d267f85d5acc4f84fc2b3a990b5c) @@ -123,42 +123,8 @@ + - - - - tags-bean - /WEB-INF/tlds/struts/struts-bean.tld - - - tags-html - /WEB-INF/tlds/struts/struts-html.tld - - - tags-logic - /WEB-INF/tlds/struts/struts-logic.tld - - - tags-tiles - /WEB-INF/tlds/struts/struts-tiles.tld - - - tags-bean-el - /WEB-INF/tlds/struts/struts-bean-el.tld - - - tags-html-el - /WEB-INF/tlds/struts/struts-html-el.tld - - - tags-logic-el - /WEB-INF/tlds/struts/struts-logic-el.tld - - - tags-tiles-el - /WEB-INF/tlds/struts/struts-tiles-el.tld - - Index: lams_tool_nb/web/authoring/advance.jsp =================================================================== diff -u -re998cf2de8c4714022559cb5f67e61b677a2dd28 -rec1390884180d267f85d5acc4f84fc2b3a990b5c --- lams_tool_nb/web/authoring/advance.jsp (.../advance.jsp) (revision e998cf2de8c4714022559cb5f67e61b677a2dd28) +++ lams_tool_nb/web/authoring/advance.jsp (.../advance.jsp) (revision ec1390884180d267f85d5acc4f84fc2b3a990b5c) @@ -8,7 +8,7 @@
@@ -30,7 +30,6 @@ rao.checked = true; } } - ra.onkeyup=turnOnRefect; //--> Index: lams_tool_nb/web/includes/taglibs.jsp =================================================================== diff -u -ra2d72bee6029b7e05e8cd696c02db214f3049365 -rec1390884180d267f85d5acc4f84fc2b3a990b5c --- lams_tool_nb/web/includes/taglibs.jsp (.../taglibs.jsp) (revision a2d72bee6029b7e05e8cd696c02db214f3049365) +++ lams_tool_nb/web/includes/taglibs.jsp (.../taglibs.jsp) (revision ec1390884180d267f85d5acc4f84fc2b3a990b5c) @@ -1,9 +1,6 @@ <%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%> -<%@ taglib uri="tags-bean" prefix="bean"%> -<%@ taglib uri="tags-logic" prefix="logic"%> -<%@ taglib uri="tags-tiles" prefix="tiles"%> -<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-function" prefix="fn" %> <%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-fmt" prefix="fmt"%> <%@ taglib uri="tags-lams" prefix="lams"%> Index: lams_tool_nb/web/learnerContent.jsp =================================================================== diff -u -r52b9e7960ddce8e644d0e4f9a77603df1465600d -rec1390884180d267f85d5acc4f84fc2b3a990b5c --- lams_tool_nb/web/learnerContent.jsp (.../learnerContent.jsp) (revision 52b9e7960ddce8e644d0e4f9a77603df1465600d) +++ lams_tool_nb/web/learnerContent.jsp (.../learnerContent.jsp) (revision ec1390884180d267f85d5acc4f84fc2b3a990b5c) @@ -23,23 +23,24 @@ } } - function reflect() { - var submitUrl = ""+${mode}+"/reflect.do?sessionMapID=${sessionMapID}"; - return submitCount(submitUrl); - } - function finish() { - var finishUrl = ""+${mode}+"/finish.do?sessionMapID=${sessionMapID}"; + var finishUrl = "learning/finish.do?sessionMapID=${sessionMapID}"; return submitCount(finishUrl); } + + function reflect() { + var reflectUrl = "learning/reflect.do?sessionMapID=${sessionMapID}"; + return submitCount(reflectUrl); + } +
- + @@ -72,25 +73,22 @@ - - - - - - - - - - - - + Index: lams_tool_nb/web/reflect.jsp =================================================================== diff -u -r52b9e7960ddce8e644d0e4f9a77603df1465600d -rec1390884180d267f85d5acc4f84fc2b3a990b5c --- lams_tool_nb/web/reflect.jsp (.../reflect.jsp) (revision 52b9e7960ddce8e644d0e4f9a77603df1465600d) +++ lams_tool_nb/web/reflect.jsp (.../reflect.jsp) (revision ec1390884180d267f85d5acc4f84fc2b3a990b5c) @@ -27,7 +27,7 @@ - +
@@ -38,7 +38,6 @@ -