Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java,v diff -u -r1.27 -r1.28 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java 19 Feb 2006 19:12:56 -0000 1.27 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java 21 Feb 2006 11:29:07 -0000 1.28 @@ -279,6 +279,7 @@ public static final String ATTACHMENT_LIST ="attachmentList"; + public static final String SUBMIT_SUCCESS ="sbmtSuccess"; public static final String DELETED_ATTACHMENT_LIST ="deletedAttachmentList"; public static final String UUID ="uuid"; } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Attic/QaResources.properties,v diff -u -r1.14 -r1.15 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties 20 Feb 2006 17:39:18 -0000 1.14 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties 21 Feb 2006 11:29:07 -0000 1.15 @@ -58,6 +58,7 @@ error.reportTitle =The field "Report Title (Advanced)" is mandatory.
error.defaultquestion.empty =The first question can not be empty.
submit.successful =The content has been created successfully.
+submit.unSuccessful =Warning: An error occurred while saving the content.
error.content.locked =The content has been locked since it is being used by one mor more learners.
The modification of the content is not allowed. error.content.inUse =The modification of the content is not allowed since one or more students has attempted the activity. Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/Attic/QAction.java,v diff -u -r1.22 -r1.23 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QAction.java 19 Feb 2006 19:15:07 -0000 1.22 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QAction.java 21 Feb 2006 11:29:07 -0000 1.23 @@ -381,11 +381,14 @@ // } public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { + request.getSession().setAttribute(SUBMIT_SUCCESS, new Integer(0)); return (mapping.findForward(LOAD_QUESTIONS)); } public ActionForward submitAllContent(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { + + request.getSession().setAttribute(SUBMIT_SUCCESS, new Integer(0)); QaAuthoringForm qaAuthoringForm = (QaAuthoringForm) form; IQaService qaService = QaServiceProxy.getQaService(getServlet().getServletContext()); AuthoringUtil authoringUtil= new AuthoringUtil(); @@ -439,8 +442,11 @@ /*give the user a feedback*/ errors.clear(); - errors.add(Globals.ERROR_KEY, new ActionMessage("submit.successful")); - logger.debug("submit successful."); + errors.add(Globals.ERROR_KEY, new ActionMessage("submit.successful")); + request.getSession().setAttribute(SUBMIT_SUCCESS, new Integer(1)); + logger.debug("setting SUBMIT_SUCCESS to 1."); + + saveErrors(request,errors); qaAuthoringForm.resetUserAction(); @@ -456,6 +462,7 @@ public ActionForward addNewQuestion(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { + request.getSession().setAttribute(SUBMIT_SUCCESS, new Integer(0)); AuthoringUtil authoringUtil= new AuthoringUtil(); Map mapQuestionContent=(Map)request.getSession().getAttribute(MAP_QUESTION_CONTENT); @@ -467,6 +474,7 @@ public ActionForward removeQuestion(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { + request.getSession().setAttribute(SUBMIT_SUCCESS, new Integer(0)); AuthoringUtil authoringUtil= new AuthoringUtil(); QaAuthoringForm qaAuthoringForm = (QaAuthoringForm) form; Map mapQuestionContent=(Map)request.getSession().getAttribute(MAP_QUESTION_CONTENT); @@ -479,6 +487,7 @@ public ActionForward addNewFile(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { + request.getSession().setAttribute(SUBMIT_SUCCESS, new Integer(0)); QaAuthoringForm qaAuthoringForm = (QaAuthoringForm) form; addFileToContentRepository(request, qaAuthoringForm); @@ -493,6 +502,7 @@ HttpServletResponse response) throws IOException, ServletException { + request.getSession().setAttribute(SUBMIT_SUCCESS, new Integer(0)); long uuid = WebUtil.readLongParam(request, UUID); // move the file's details from the attachment collection to the deleted attachments collection @@ -523,6 +533,7 @@ */ protected ActionMessages validateSubmit(HttpServletRequest request, ActionMessages errors, QaAuthoringForm qaAuthoringForm) { + request.getSession().setAttribute(SUBMIT_SUCCESS, new Integer(0)); // String richTextTitle=(String) request.getSession().getAttribute(RICHTEXT_TITLE); String title = qaAuthoringForm.getTitle(); logger.debug("title: " + title); @@ -647,6 +658,7 @@ HttpServletResponse response) throws IOException, ServletException, ToolException { + request.getSession().setAttribute(SUBMIT_SUCCESS, new Integer(0)); /* * if the content is not ready yet, don't even proceed. * check the define later status Index: lams_tool_laqa/web/AdvancedContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/Attic/AdvancedContent.jsp,v diff -u -r1.5 -r1.6 --- lams_tool_laqa/web/AdvancedContent.jsp 20 Feb 2006 17:39:30 -0000 1.5 +++ lams_tool_laqa/web/AdvancedContent.jsp 21 Feb 2006 11:29:07 -0000 1.6 @@ -3,6 +3,7 @@ <%@ taglib uri="/WEB-INF/struts-logic-el.tld" prefix="logic-el" %> <%@ taglib uri="/WEB-INF/c.tld" prefix="c" %> <%@ taglib uri="/WEB-INF/fmt.tld" prefix="fmt" %> +<%@ taglib uri="/WEB-INF/lams.tld" prefix="lams" %>
Index: lams_tool_laqa/web/BasicContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/Attic/BasicContent.jsp,v diff -u -r1.15 -r1.16 --- lams_tool_laqa/web/BasicContent.jsp 20 Feb 2006 17:39:30 -0000 1.15 +++ lams_tool_laqa/web/BasicContent.jsp 21 Feb 2006 11:29:07 -0000 1.16 @@ -4,6 +4,7 @@ <%@ taglib uri="/WEB-INF/c.tld" prefix="c" %> <%@ taglib uri="/WEB-INF/fmt.tld" prefix="fmt" %> <%@ taglib uri="fck-editor" prefix="FCK" %> +<%@ taglib uri="/WEB-INF/lams.tld" prefix="lams" %>
Index: lams_tool_laqa/web/Errorbox.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/Attic/Errorbox.jsp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_laqa/web/Errorbox.jsp 21 Feb 2006 11:29:07 -0000 1.1 @@ -0,0 +1,49 @@ + +<%@ taglib uri="/WEB-INF/struts-html-el.tld" prefix="html" %> +<%@ taglib uri="/WEB-INF/fmt.tld" prefix="fmt" %> +<%@ taglib uri="/WEB-INF/c.tld" prefix="c" %> +<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> +<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %> +<%@ taglib uri="fck-editor" prefix="FCK" %> +<%@ taglib uri="/WEB-INF/lams.tld" prefix="lams" %> + +doing error box + + + + + + + + + + + + + + + + + + + + Index: lams_tool_laqa/web/InstructionsContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/Attic/InstructionsContent.jsp,v diff -u -r1.15 -r1.16 --- lams_tool_laqa/web/InstructionsContent.jsp 20 Feb 2006 17:39:30 -0000 1.15 +++ lams_tool_laqa/web/InstructionsContent.jsp 21 Feb 2006 11:29:07 -0000 1.16 @@ -5,6 +5,7 @@ <%@ taglib uri="/WEB-INF/fmt.tld" prefix="fmt" %> <%@ taglib uri="fck-editor" prefix="FCK" %> <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %> +<%@ taglib uri="/WEB-INF/lams.tld" prefix="lams" %>
Index: lams_tool_laqa/web/author_page.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/Attic/author_page.jsp,v diff -u -r1.6 -r1.7 --- lams_tool_laqa/web/author_page.jsp 20 Feb 2006 17:39:30 -0000 1.6 +++ lams_tool_laqa/web/author_page.jsp 21 Feb 2006 11:29:07 -0000 1.7 @@ -4,11 +4,12 @@ <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %> <%@ taglib uri="fck-editor" prefix="FCK" %> -<%@ taglib uri="tags-lams" prefix="lams" %> +<%@ taglib uri="/WEB-INF/lams.tld" prefix="lams" %> + <% String protocol = request.getProtocol(); if(protocol.startsWith("HTTPS")){ @@ -110,7 +111,7 @@

Question & Answers

- +
@@ -127,13 +128,24 @@

+ + + + + +
+ + + +
+
- Cancel - Save + Cancel + Save
@@ -144,8 +156,6 @@
- Cancel - Save
@@ -156,8 +166,6 @@
- Cancel - Save
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_laqa/web/errorbox.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_laqa/web/images/error.jpg =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/images/error.jpg,v diff -u Binary files differ Index: lams_tool_laqa/web/images/success.gif =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/images/success.gif,v diff -u Binary files differ