Index: lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml,v
diff -u -r1.2 -r1.3
--- lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml	10 Mar 2006 16:34:17 -0000	1.2
+++ lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml	20 Sep 2006 15:08:34 -0000	1.3
@@ -34,7 +34,16 @@
 	    >
 	    </property>
 
+	    <property
+	        name="feedback"
+	        type="java.lang.String"
+	        access="property"
+	        column="feedback"
+	        length="65535"
+	    />
+    
 
+
         <property
             name="qaContentId"
             type="java.lang.Long"
Fisheye: Tag 1.13 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.10 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.10 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQuestionContentDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Attic/QaQuestionContentDTO.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQuestionContentDTO.java	20 Sep 2006 15:08:31 -0000	1.1
@@ -0,0 +1,94 @@
+/****************************************************************
+ * 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 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
+ * ****************************************************************
+ */
+/* $$Id: QaQuestionContentDTO.java,v 1.1 2006/09/20 15:08:31 ozgurd Exp $$ */
+package org.lamsfoundation.lams.tool.qa;
+
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+
+/**
+ * <p> DTO that holds users attempt history data for jsp purposes
+ * </p>
+ * 
+ * @author Ozgur Demirtas
+ */
+public class QaQuestionContentDTO implements Comparable
+{
+    private String question;
+    private String displayOrder;
+    private String feedback;
+    
+	public String toString() {
+       return new ToStringBuilder(this)
+            .append("question:", question)
+            .append("feedback:", feedback)
+            .append("displayOrder:", displayOrder)
+            .toString();
+    }
+	
+	public int compareTo(Object o)
+    {
+		QaMonitoredUserDTO qaMonitoredUserDTO = (QaMonitoredUserDTO) o;
+     
+        if (qaMonitoredUserDTO == null)
+        	return 1;
+		else
+			return 0;
+    }
+    /**
+     * @return Returns the displayOrder.
+     */
+    public String getDisplayOrder() {
+        return displayOrder;
+    }
+    /**
+     * @param displayOrder The displayOrder to set.
+     */
+    public void setDisplayOrder(String displayOrder) {
+        this.displayOrder = displayOrder;
+    }
+    /**
+     * @return Returns the feedback.
+     */
+    public String getFeedback() {
+        return feedback;
+    }
+    /**
+     * @param feedback The feedback to set.
+     */
+    public void setFeedback(String feedback) {
+        this.feedback = feedback;
+    }
+    /**
+     * @return Returns the question.
+     */
+    public String getQuestion() {
+        return question;
+    }
+    /**
+     * @param question The question to set.
+     */
+    public void setQuestion(String question) {
+        this.question = question;
+    }
+}
Fisheye: Tag 1.9 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaSession.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaStatsDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Attic/QaStatsDTO.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaStatsDTO.java	20 Sep 2006 15:08:31 -0000	1.1
@@ -0,0 +1,84 @@
+/****************************************************************
+ * 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 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
+ * ****************************************************************
+ */
+
+/* $$Id: QaStatsDTO.java,v 1.1 2006/09/20 15:08:31 ozgurd Exp $$ */
+package org.lamsfoundation.lams.tool.qa;
+
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+
+/**
+ * <p> DTO that holds stats data
+ * </p>
+ * 
+ * @author Ozgur Demirtas
+ */
+public class QaStatsDTO implements Comparable
+{
+	private String countAllUsers;
+	
+	private String countSessionComplete;
+	
+	public String toString() {
+        return new ToStringBuilder(this)
+            .append("question", countAllUsers)
+            .append("countSessionComplete", countSessionComplete)
+            .toString();
+    }
+	
+	public int compareTo(Object o)
+    {
+	    QaStatsDTO qaStatsDTO = (QaStatsDTO) o;
+     
+        if (qaStatsDTO == null)
+        	return 1;
+		else
+			return 0;
+    }
+	
+	
+    /**
+     * @return Returns the countAllUsers.
+     */
+    public String getCountAllUsers() {
+        return countAllUsers;
+    }
+    /**
+     * @param countAllUsers The countAllUsers to set.
+     */
+    public void setCountAllUsers(String countAllUsers) {
+        this.countAllUsers = countAllUsers;
+    }
+    /**
+     * @return Returns the countSessionComplete.
+     */
+    public String getCountSessionComplete() {
+        return countSessionComplete;
+    }
+    /**
+     * @param countSessionComplete The countSessionComplete to set.
+     */
+    public void setCountSessionComplete(String countSessionComplete) {
+        this.countSessionComplete = countSessionComplete;
+    }
+}
Fisheye: Tag 1.9 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUploadedFile.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.8 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUsrResp.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_laqa/web/403.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/403.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_laqa/web/403.jsp	25 Jul 2006 05:22:38 -0000	1.1
+++ lams_tool_laqa/web/403.jsp	20 Sep 2006 15:08:31 -0000	1.2
@@ -1,3 +1,22 @@
+<%--
+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 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
+--%>
 <%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-core" prefix="c" %>
Index: lams_tool_laqa/web/404.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/404.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_laqa/web/404.jsp	25 Jul 2006 05:22:38 -0000	1.1
+++ lams_tool_laqa/web/404.jsp	20 Sep 2006 15:08:31 -0000	1.2
@@ -1,3 +1,22 @@
+<%--
+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 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
+--%>
 <%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-core" prefix="c" %>
Index: lams_tool_laqa/web/error.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/error.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_laqa/web/error.jsp	8 Aug 2006 00:52:02 -0000	1.2
+++ lams_tool_laqa/web/error.jsp	20 Sep 2006 15:08:31 -0000	1.3
@@ -1,3 +1,24 @@
+<%--
+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 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
+--%>
+
+
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" 
 	"http://www.w3.org/TR/html4/strict.dtd">
 <html>
Index: lams_tool_laqa/web/login.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/login.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_laqa/web/login.jsp	25 Jul 2006 05:22:38 -0000	1.7
+++ lams_tool_laqa/web/login.jsp	20 Sep 2006 15:08:31 -0000	1.8
@@ -1,3 +1,23 @@
+<%--
+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 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
+--%>
+
 <%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-core" prefix="c" %>
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/struts/struts-config.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_laqa/web/WEB-INF/struts/validator-rules.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/struts/Attic/validator-rules.xml,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_laqa/web/WEB-INF/struts/validator-rules.xml	20 Sep 2006 15:08:36 -0000	1.1
@@ -0,0 +1,324 @@
+<!DOCTYPE form-validation PUBLIC
+          "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.1.3//EN"
+          "http://jakarta.apache.org/commons/dtds/validator_1_1_3.dtd">
+<!--
+  $Id: validator-rules.xml,v 1.1 2006/09/20 15:08:36 ozgurd Exp $
+
+   This file contains the default Struts Validator pluggable validator
+   definitions.  It should be placed somewhere under /WEB-INF and
+   referenced in the struts-config.xml under the plug-in element
+   for the ValidatorPlugIn.
+
+      <plug-in className="org.apache.struts.validator.ValidatorPlugIn">
+        <set-property property="pathnames" value="/WEB-INF/validator-rules.xml,
+                                                  /WEB-INF/validation.xml"/>
+      </plug-in>
+
+   These are the default error messages associated with
+   each validator defined in this file.  They should be
+   added to your projects ApplicationResources.properties
+   file or you can associate new ones by modifying the
+   pluggable validators msg attributes in this file.
+
+   # Struts Validator Error Messages
+   errors.required={0} is required.
+   errors.minlength={0} can not be less than {1} characters.
+   errors.maxlength={0} can not be greater than {1} characters.
+   errors.invalid={0} is invalid.
+
+   errors.byte={0} must be a byte.
+   errors.short={0} must be a short.
+   errors.integer={0} must be an integer.
+   errors.long={0} must be a long.
+   errors.float={0} must be a float.
+   errors.double={0} must be a double.
+
+   errors.date={0} is not a date.
+   errors.range={0} is not in the range {1} through {2}.
+   errors.creditcard={0} is an invalid credit card number.
+   errors.email={0} is an invalid e-mail address.
+
+   Note: Starting in Struts 1.2.0 the default javascript definitions have
+         been consolidated to commons-validator. The default can be overridden
+         by supplying a <javascript> element with a CDATA section, just as
+         in struts 1.1.
+
+-->
+
+<form-validation>
+
+   <global>
+   
+      <validator name="maxFileSize"
+            classname="org.lamsfoundation.lams.util.FileValidatorUtil"
+               method="validateFileSize"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
+                       javax.servlet.http.HttpServletRequest"
+                  msg="errors.maxfilesize"/>               
+                  
+      <validator name="required"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateRequired"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
+                       javax.servlet.http.HttpServletRequest"
+                  msg="errors.required"/>
+
+      <validator name="requiredif"
+                 classname="org.apache.struts.validator.FieldChecks"
+                 method="validateRequiredIf"
+                 methodParams="java.lang.Object,
+                               org.apache.commons.validator.ValidatorAction,
+                               org.apache.commons.validator.Field,
+                               org.apache.struts.action.ActionMessages,
+                               org.apache.commons.validator.Validator,
+                               javax.servlet.http.HttpServletRequest"
+                 msg="errors.required"/>
+
+      <validator name="validwhen"
+          msg="errors.required"
+                 classname="org.apache.struts.validator.validwhen.ValidWhen"
+                 method="validateValidWhen"
+                 methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
+                       javax.servlet.http.HttpServletRequest"/>
+
+
+      <validator name="minlength"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateMinLength"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.minlength"
+           jsFunction="org.apache.commons.validator.javascript.validateMinLength"/>
+
+
+      <validator name="maxlength"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateMaxLength"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.maxlength"
+           jsFunction="org.apache.commons.validator.javascript.validateMaxLength"/>
+
+
+
+      <validator name="mask"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateMask"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.invalid"/>
+
+
+      <validator name="byte"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateByte"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.byte"
+       jsFunctionName="ByteValidations"/>
+
+
+      <validator name="short"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateShort"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.short"
+       jsFunctionName="ShortValidations"/>
+
+
+      <validator name="integer"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateInteger"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.integer"
+       jsFunctionName="IntegerValidations"/>
+
+
+
+      <validator name="long"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateLong"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.long"/>
+
+
+      <validator name="float"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateFloat"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.float"
+       jsFunctionName="FloatValidations"/>
+
+      <validator name="double"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateDouble"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.double"/>
+
+
+      <validator name="date"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateDate"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.date"
+       jsFunctionName="DateValidations"/>
+
+
+      <validator name="intRange"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateIntRange"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
+                       javax.servlet.http.HttpServletRequest"
+              depends="integer"
+                  msg="errors.range"/>
+
+
+      <validator name="floatRange"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateFloatRange"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
+                       javax.servlet.http.HttpServletRequest"
+              depends="float"
+                  msg="errors.range"/>
+
+      <validator name="doubleRange"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateDoubleRange"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
+                       javax.servlet.http.HttpServletRequest"
+              depends="double"
+                  msg="errors.range"/>
+
+
+      <validator name="creditCard"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateCreditCard"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.creditcard"/>
+
+
+      <validator name="email"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateEmail"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.email"/>
+
+      <validator name="url"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateUrl"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.url"/>
+
+     <!--
+       This simply allows struts to include the validateUtilities into a page, it should
+       not be used as a validation rule.
+     -->
+     <validator name="includeJavaScriptUtilities"
+            classname=""
+               method=""
+         methodParams=""
+              depends=""
+                  msg=""
+           jsFunction="org.apache.commons.validator.javascript.validateUtilities"/>
+
+   </global>
+
+</form-validation>
Index: lams_tool_laqa/web/WEB-INF/tags/FCKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/tags/Attic/FCKEditor.tag,v
diff -u
Binary files differ
Index: lams_tool_laqa/web/authoring/editQuestionBox.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/authoring/editQuestionBox.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_laqa/web/authoring/editQuestionBox.jsp	20 Sep 2006 15:08:34 -0000	1.1
@@ -0,0 +1,113 @@
+<%--
+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 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
+--%>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
+
+<%@ include file="/common/taglibs.jsp"%>
+<html>
+	<head>
+		<%@ include file="/common/header.jsp"%>
+		
+		<script language="JavaScript" type="text/JavaScript">
+
+			function submitMethod() {
+				document.QaAuthoringForm.submit();
+			}
+			
+			function submitMethod(actionMethod) {
+				document.QaAuthoringForm.dispatch.value=actionMethod; 
+				document.QaAuthoringForm.submit();
+			}
+			
+		</script>		
+	</head>
+	
+	<body>
+		<table cellpadding="0">
+	
+
+			<html:form  action="/authoring?validate=false" styleId="newQuestionForm" enctype="multipart/form-data" method="POST">					   	
+			
+			<html:hidden property="dispatch" value="saveSingleQuestion"/>
+			<html:hidden property="toolContentID"/>
+			<html:hidden property="currentTab" styleId="currentTab" />
+			<html:hidden property="activeModule"/>
+			<html:hidden property="httpSessionID"/>								
+			<html:hidden property="defaultContentIdStr"/>								
+			<html:hidden property="defineLaterInEditMode"/>										
+			<html:hidden property="contentFolderID"/>														
+			<html:hidden property="editableQuestionIndex"/>														
+			<html:hidden property="editQuestionBoxRequest" value="true"/>																	
+
+		
+			<tr>
+			<td>
+			<table class="innerforms">
+		
+				<tr>
+					<td>
+						<div class="field-name" style="text-align: left;">
+							<fmt:message key="label.edit.question"></fmt:message>
+						</div>
+						
+						<lams:FCKEditor id="newQuestion"
+							value="${qaGeneralAuthoringDTO.editableQuestionText}"
+							contentFolderID="${qaGeneralAuthoringDTO.contentFolderID}"></lams:FCKEditor>
+					</td>
+				</tr>
+				
+
+				<tr>
+					<td>
+						<div class="field-name" style="text-align: left;">
+							<fmt:message key="label.feedback"></fmt:message>
+						</div>
+						<html:textarea property="feedback" rows="3" cols="70"></html:textarea>							
+					</td>
+				</tr>
+
+				<tr>
+					<td align="center" valign="bottom">
+						<a href="#" onclick="javascript:window.parent.hideMessage()" class="button">
+							<bean:message key="label.cancel" />
+						</a>
+
+						&nbsp; &nbsp;					
+                        
+						<a href="#" onclick="getElementById('newQuestionForm').submit();" class="button-add-item">
+							<bean:message key="label.save.question" />
+						</a>
+					
+						<BR><BR>
+					</td>
+				</tr>
+				
+
+			</table>				
+			</td>
+			</tr>
+				
+			</html:form>
+			
+		</table>
+
+	</body>
+</html>
Index: lams_tool_laqa/web/authoring/itemlist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/authoring/itemlist.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_laqa/web/authoring/itemlist.jsp	20 Sep 2006 15:08:32 -0000	1.1
@@ -0,0 +1,104 @@
+<%--
+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 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
+--%>
+
+<%@ include file="/common/taglibs.jsp" %>
+<c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request"/>
+<div id="itemList">
+<h2><fmt:message key="label.questions" />
+<img src="${ctxPath}/includes/images/indicator.gif" style="display:none" id="resourceListArea_Busy" /></h2>
+
+<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
+<table id="itemTable" style="align:left;width:650px" >
+    <c:set var="queIndex" scope="request" value="0"/>
+    
+    
+    <c:forEach items="${listQuestionContentDTO}" var="currentDTO" varStatus="status">
+	<c:set var="queIndex" scope="request" value="${queIndex +1}"/>
+	<c:set var="question" scope="request" value="${currentDTO.question}"/>
+	<c:set var="feedback" scope="request" value="${currentDTO.feedback}"/>
+	<c:set var="displayOrder" scope="request" value="${currentDTO.displayOrder}"/>	
+
+	<tr>
+		<td width="10%" align="right" class="field-name">
+			<fmt:message key="label.question" />:
+		</td>
+
+		<td width="60%" align="left">
+			<c:out value="${question}" escapeXml="false"/> 
+		</td>		
+
+
+
+			<td width="10%" align="right">
+		 		<c:if test="${totalQuestionCount != 1}"> 		
+		 		
+			 		<c:if test="${queIndex == 1}"> 		
+						<a title="<bean:message key='label.tip.moveQuestionDown'/>" href="javascript:;" onclick="javascript:submitModifyAuthoringQuestion('<c:out value="${queIndex}"/>','moveQuestionDown');">
+		                            <img src="<c:out value="${tool}"/>images/down.gif" border="0">
+						</a> 
+					</c:if> 							
+	
+			 		<c:if test="${queIndex == totalQuestionCount}"> 		
+						<a title="<bean:message key='label.tip.moveQuestionUp'/>" href="javascript:;" onclick="javascript:submitModifyAuthoringQuestion('<c:out value="${queIndex}"/>','moveQuestionUp');">
+		                            <img src="<c:out value="${tool}"/>images/up.gif" border="0">
+						</a> 
+					</c:if> 							
+					
+					<c:if test="${(queIndex != 1)  && (queIndex != totalQuestionCount)}"> 		
+						<a title="<bean:message key='label.tip.moveQuestionDown'/>" href="javascript:;" onclick="javascript:submitModifyAuthoringQuestion('<c:out value="${queIndex}"/>','moveQuestionDown');">
+		                            <img src="<c:out value="${tool}"/>images/down.gif" border="0">
+						</a> 
+	
+						<a title="<bean:message key='label.tip.moveQuestionUp'/>" href="javascript:;" onclick="javascript:submitModifyAuthoringQuestion('<c:out value="${queIndex}"/>','moveQuestionUp');">
+		                            <img src="<c:out value="${tool}"/>images/up.gif" border="0">
+						</a> 
+					</c:if> 							
+				
+				</c:if> 			
+			</td>
+
+		
+
+		<td width="10%" align="right">
+				<a title="<bean:message key='label.tip.editQuestion'/>" href="javascript:;" onclick="javascript:showMessage('<html:rewrite page="/authoring.do?dispatch=newEditableQuestionBox&questionIndex=${queIndex}&contentFolderID=${qaGeneralAuthoringDTO.contentFolderID}&httpSessionID=${qaGeneralAuthoringDTO.httpSessionID}&toolContentID=${qaGeneralAuthoringDTO.toolContentID}&activeModule=${qaGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${qaGeneralAuthoringDTO.defaultContentIdStr}&synchInMonitor=${qaGeneralAuthoringDTO.synchInMonitor}&usernameVisible=${qaGeneralAuthoringDTO.usernameVisible}&questionsSequenced=${qaGeneralAuthoringDTO.questionsSequenced}"/>');">
+	                    <img src="<c:out value="${tool}"/>images/edit.gif" border="0">
+				</a> 
+		</td>
+
+		<td width="10%" align="right">
+				<a title="<bean:message key='label.tip.deleteQuestion'/>" href="javascript:;" onclick="removeQuestion(${queIndex});">
+	                    <img src="<c:out value="${tool}"/>images/delete.gif" border="0">
+				</a> 				
+		</td>
+	</tr>
+</c:forEach>
+
+</table>
+</div>
+<%-- This script will works when a new resoruce item submit in order to refresh "Resource List" panel. --%>
+<script lang="javascript">
+ 
+	if(window.top != null){
+		window.top.hideMessage();
+		var obj = window.top.document.getElementById('resourceListArea');
+		obj.innerHTML= document.getElementById("itemList").innerHTML;
+	}
+</script>
+
Index: lams_tool_laqa/web/authoring/itemlistViewOnly.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/authoring/Attic/itemlistViewOnly.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_laqa/web/authoring/itemlistViewOnly.jsp	20 Sep 2006 15:08:34 -0000	1.1
@@ -0,0 +1,94 @@
+<%--
+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 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
+--%>
+
+
+<%@ include file="/common/taglibs.jsp" %>
+<c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request"/>
+<div id="itemList">
+<h2><fmt:message key="label.questions" />
+<img src="${ctxPath}/includes/images/indicator.gif" style="display:none" id="resourceListArea_Busy" /></h2>
+
+<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
+<table id="itemTable" style="align:left;width:650px" >
+    <c:set var="queIndex" scope="request" value="0"/>
+    
+    
+    <c:forEach items="${listQuestionContentDTO}" var="currentDTO" varStatus="status">
+	<c:set var="queIndex" scope="request" value="${queIndex +1}"/>
+	<c:set var="question" scope="request" value="${currentDTO.question}"/>
+	<c:set var="feedback" scope="request" value="${currentDTO.feedback}"/>
+	<c:set var="displayOrder" scope="request" value="${currentDTO.displayOrder}"/>	
+
+	<tr>
+		<td width="10%" align="right" class="field-name">
+			<fmt:message key="label.question" />:
+		</td>
+
+		<td width="60%" align="left">
+			<c:out value="${question}" escapeXml="false"/> 
+		</td>		
+
+
+		<td width="10%" align="right">
+	 		<c:if test="${totalQuestionCount != 1}"> 		
+	 		
+		 		<c:if test="${queIndex == 1}"> 		
+					<a title="<bean:message key='label.tip.moveQuestionDown'/>" href="javascript:;">
+	                            <img src="<c:out value="${tool}"/>images/down.gif" border="0">
+					</a> 
+				</c:if> 							
+
+		 		<c:if test="${queIndex == totalQuestionCount}"> 		
+					<a title="<bean:message key='label.tip.moveQuestionUp'/>" href="javascript:;" >
+	                            <img src="<c:out value="${tool}"/>images/up.gif" border="0">
+					</a> 
+				</c:if> 							
+				
+				<c:if test="${(queIndex != 1)  && (queIndex != totalQuestionCount)}"> 		
+					<a title="<bean:message key='label.tip.moveQuestionDown'/>" href="javascript:;" >
+	                            <img src="<c:out value="${tool}"/>images/down.gif" border="0">
+					</a> 
+
+					<a title="<bean:message key='label.tip.moveQuestionUp'/>" href="javascript:;" >
+	                            <img src="<c:out value="${tool}"/>images/up.gif" border="0">
+					</a> 
+				</c:if> 							
+			
+			</c:if> 			
+		</td>
+       	
+		
+
+		<td width="10%" align="right">
+				<a title="<bean:message key='label.tip.editQuestion'/>" href="javascript:;" >
+	                    <img src="<c:out value="${tool}"/>images/edit.gif" border="0">
+				</a> 
+		</td>
+
+		<td width="10%" align="right">
+				<a title="<bean:message key='label.tip.deleteQuestion'/>" href="javascript:;" >
+	                    <img src="<c:out value="${tool}"/>images/delete.gif" border="0">
+				</a> 				
+		</td>
+	</tr>
+</c:forEach>
+
+</table>
+</div>
Index: lams_tool_laqa/web/authoring/newQuestionBox.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/authoring/newQuestionBox.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_laqa/web/authoring/newQuestionBox.jsp	20 Sep 2006 15:08:33 -0000	1.1
@@ -0,0 +1,109 @@
+<%--
+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 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
+--%>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
+
+<%@ include file="/common/taglibs.jsp"%>
+<html>
+	<head>
+		<%@ include file="/common/header.jsp"%>
+		
+		<script language="JavaScript" type="text/JavaScript">
+
+			function submitMethod() {
+				document.QaAuthoringForm.submit();
+			}
+			
+			function submitMethod(actionMethod) {
+				document.QaAuthoringForm.dispatch.value=actionMethod; 
+				document.QaAuthoringForm.submit();
+			}
+			
+		</script>		
+	</head>
+	
+	<body>
+		<table cellpadding="0">
+	
+
+			<html:form  action="/authoring?validate=false" styleId="newQuestionForm" enctype="multipart/form-data" method="POST">				
+			<html:hidden property="dispatch" value="addSingleQuestion"/>
+			<html:hidden property="toolContentID"/>
+			<html:hidden property="currentTab" styleId="currentTab" />
+			<html:hidden property="activeModule"/>
+			<html:hidden property="httpSessionID"/>								
+			<html:hidden property="defaultContentIdStr"/>								
+			<html:hidden property="defineLaterInEditMode"/>										
+			<html:hidden property="contentFolderID"/>														
+			<html:hidden property="editQuestionBoxRequest" value="false"/>																				
+			
+			<tr>
+			<td>
+			<table class="innerforms">
+		
+				<tr>
+					<td>
+						<div class="field-name" style="text-align: left;">
+							<fmt:message key="label.add.new.question"></fmt:message>
+						</div>
+						<lams:FCKEditor id="newQuestion"
+							value="${qaGeneralAuthoringDTO.editableQuestionText}"
+							contentFolderID="${qaGeneralAuthoringDTO.contentFolderID}"></lams:FCKEditor>
+					</td>
+				</tr>
+				
+
+				<tr>
+					<td>
+						<div class="field-name" style="text-align: left;">
+							<fmt:message key="label.feedback"></fmt:message>
+						</div>
+						<html:textarea property="feedback" rows="3" cols="70"></html:textarea>							
+					</td>
+				</tr>
+				
+
+				<tr>
+					<td align="center" valign="bottom">
+						<a href="#" onclick="javascript:window.parent.hideMessage()" class="button">
+							<bean:message key="label.cancel" />
+						</a>
+
+						&nbsp; &nbsp;					
+                        
+						<a href="#" onclick="getElementById('newQuestionForm').submit();" class="button-add-item">
+							<bean:message key="label.save.question" />
+						</a>
+					
+						<BR><BR>
+					</td>
+				</tr>
+				
+
+			</table>				
+			</td>
+			</tr>
+				
+			</html:form>
+		</table>
+
+	</body>
+</html>
Index: lams_tool_laqa/web/common/header.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/common/header.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_laqa/web/common/header.jsp	6 Jul 2006 04:37:27 -0000	1.2
+++ lams_tool_laqa/web/common/header.jsp	20 Sep 2006 15:08:35 -0000	1.3
@@ -1,25 +1,36 @@
 <%@ include file="/common/taglibs.jsp"%>
-<c:set var="lams"><lams:LAMSURL/></c:set>
-<c:set var="tool"><lams:WebAppURL/></c:set>
-<c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request"/>
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+<c:set var="tool">
+	<lams:WebAppURL />
+</c:set>
+<c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request" />
 
-	
-	<!-- HTTP 1.1 -->
-	<meta http-equiv="Cache-Control" content="no-store"/>
-	<!-- HTTP 1.0 -->
-	<meta http-equiv="Pragma" content="no-cache"/>
-	<!-- Prevents caching at the Proxy Server -->
-	<meta http-equiv="Expires" content="0"/>
-	
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> 
 
- 	<!-- ********************  CSS ********************** -->
-	<lams:css />
+<!-- HTTP 1.1 -->
+<meta http-equiv="Cache-Control" content="no-store" />
+<!-- HTTP 1.0 -->
+<meta http-equiv="Pragma" content="no-cache" />
+<!-- Prevents caching at the Proxy Server -->
+<meta http-equiv="Expires" content="0" />
 
- 	<!-- ********************  javascript ********************** -->
-	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/prototype.js"></script>
-	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/rsrccommon.js'/>"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>    
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
-	
\ No newline at end of file
+<!-- ********************  CSS ********************** -->
+<c:choose>
+	<c:when test="${not empty localLinkPath}">
+		<lams:css localLinkPath="${localLinkPath}"/>
+	</c:when>
+	<c:otherwise>
+		<lams:css />
+	</c:otherwise>
+</c:choose>
+
+<!-- ********************  javascript ********************** -->
+<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/prototype.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
+
+<%@ include file="/common/fckeditorheader.jsp"%>
+
Index: lams_tool_laqa/web/common/messages.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/common/messages.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_laqa/web/common/messages.jsp	29 Jun 2006 00:41:25 -0000	1.1
+++ lams_tool_laqa/web/common/messages.jsp	20 Sep 2006 15:08:35 -0000	1.2
@@ -2,9 +2,9 @@
 <logic:messagesPresent>
     <div class="error" id="errorMessages">
         <html:messages id="error">
-            <html:img page="/includes/images/iconWarning.gif" 
+            &nbsp&nbsp <html:img page="/images/iconWarning.gif" 
                styleClass="icon"/>
-            <c:out value="${error}" escapeXml="false"/><br/>
+            &nbsp&nbsp <c:out value="${error}" escapeXml="false"/><br/>
         </html:messages>
     </div>
 </logic:messagesPresent>
@@ -13,8 +13,8 @@
 <logic:messagesPresent message="true">
     <div class="message" id="successMessages">
         <html:messages id="message" message="true">
-            <html:img page="/includes/images/iconInformation.gif" styleClass="icon"/>
-            <c:out value="${message}" escapeXml="false"/><br/>
+            &nbsp&nbsp <html:img page="/images/iconInformation.gif" styleClass="icon"/>
+            &nbsp&nbsp <c:out value="${message}" escapeXml="false"/><br/>
         </html:messages>
     </div>
 </logic:messagesPresent>
\ No newline at end of file
Index: lams_tool_laqa/web/common/taglibs.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/common/taglibs.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_laqa/web/common/taglibs.jsp	29 Jun 2006 00:41:25 -0000	1.1
+++ lams_tool_laqa/web/common/taglibs.jsp	20 Sep 2006 15:08:35 -0000	1.2
@@ -1,4 +1,4 @@
-<%@ page language="java" errorPage="/error.jsp" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
+<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
 <%@ taglib uri="tags-tiles" prefix="tiles" %>
 <%@ taglib uri="tags-bean" prefix="bean" %>
 <%@ taglib uri="tags-html" prefix="html" %>
@@ -10,4 +10,3 @@
 <%@ taglib uri="tags-lams" prefix="lams" %>
 <%@ taglib uri="fck-editor" prefix="FCK"%>
 
-
Index: lams_tool_laqa/web/images/iconInformation.gif
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/images/iconInformation.gif,v
diff -u
Binary files differ
Index: lams_tool_laqa/web/images/iconWarning.gif
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/images/iconWarning.gif,v
diff -u
Binary files differ
Index: lams_tool_laqa/web/includes/blank.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/includes/Attic/blank.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_laqa/web/includes/blank.jsp	20 Sep 2006 15:08:31 -0000	1.1
@@ -0,0 +1,3 @@
+<%@ include file="/common/taglibs.jsp" %>
+<%@ include file="/common/messages.jsp" %>
+
Index: lams_tool_laqa/web/includes/error.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/includes/Attic/error.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_laqa/web/includes/error.jsp	20 Sep 2006 15:08:31 -0000	1.1
@@ -0,0 +1,7 @@
+<%@ page language="java" %>
+<%@ include file="/includes/taglibs.jsp" %>
+<br />
+<table align="center"><tr>
+<td valign="top"><html:img page="/images/icon_error.gif" /></td>
+<td><html:errors/></td>
+</tr></table>
Index: lams_tool_laqa/web/includes/layout.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/includes/Attic/layout.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_laqa/web/includes/layout.jsp	20 Sep 2006 15:08:31 -0000	1.1
@@ -0,0 +1,32 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
+
+<%@ include file="/common/taglibs.jsp"%>
+<%@ taglib uri="tags-tiles" prefix="tiles"%>
+
+<html>
+	<head>
+		<title><bean:message key="activity.title" /></title>
+		<%@ include file="/common/header.jsp"%>
+	</head>
+	<body>
+		<div id="page">
+			<tiles:useAttribute name="pageTitleKey" scope="request" />
+			<bean:define name="pageTitleKey" id="pTitleKey" type="String" />
+			<logic:notEmpty name="pTitleKey">
+				<h1 class="no-tabs-below">
+					<bean:message key="<%=pTitleKey %>" />
+				</h1>
+			</logic:notEmpty>
+
+			<div id="header"></div>
+
+			<div id="content">
+				<tiles:insert attribute="body" />
+			</div>
+
+			<div id="footer">
+			</div>
+		</div>
+	</body>
+</html>
Index: lams_tool_laqa/web/includes/learnerLayout.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/includes/Attic/learnerLayout.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_laqa/web/includes/learnerLayout.jsp	20 Sep 2006 15:08:31 -0000	1.1
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
+
+<%@ include file="/common/taglibs.jsp"%>
+<%@ taglib uri="tags-tiles" prefix="tiles"%>
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+<c:set var="tool">
+	<lams:WebAppURL />
+</c:set>
+<html>
+	<head>
+		<title><bean:message key="activity.title" /></title>
+		<%@ include file="/common/header.jsp"%>
+		<script type="text/javascript">
+			var removeItemAttachmentUrl = "<html:rewrite page="/learning/deleteAttachment.do" />";
+		</script>		
+		<script type="text/javascript" src="${tool}includes/javascript/message.js"></script>
+		<script type="text/javascript">
+			function removeAtt(mapID){
+				removeItemAttachmentUrl =  removeItemAttachmentUrl + "?sessionMapID="+ mapID;
+				removeItemAttachment();
+			}
+		</script>		
+		
+	</head>
+	<body>
+		<div id="page-learner">
+			<tiles:insert attribute="body" />
+		</div>
+	</body>
+</html>
Index: lams_tool_laqa/web/includes/tablayout.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/includes/Attic/tablayout.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_laqa/web/includes/tablayout.jsp	20 Sep 2006 15:08:31 -0000	1.1
@@ -0,0 +1,31 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
+
+<%@ include file="/common/taglibs.jsp"%>
+<%@ taglib uri="tags-tiles" prefix="tiles"%>
+
+<html>
+	<head>
+		<title><bean:message key="activity.title" /></title>
+		<%@ include file="/common/header.jsp"%>
+
+		<tiles:insert attribute="header" />
+	</head>
+
+	<body onLoad="init()">
+		<div id="page">
+	
+				<tiles:useAttribute name="pageTitleKey" scope="request" />
+				<bean:define name="pageTitleKey" id="pTitleKey" type="String" />
+				<logic:notEmpty name="pTitleKey">
+					<h1>
+						<bean:message key="<%=pTitleKey %>" />
+					</h1>
+				</logic:notEmpty>
+
+				<tiles:insert attribute="body" />
+
+			<div id="footer"></div>
+		</div>
+	</body>
+</html>
Index: lams_tool_laqa/web/includes/taglibs.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/includes/Attic/taglibs.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_laqa/web/includes/taglibs.jsp	20 Sep 2006 15:08:31 -0000	1.1
@@ -0,0 +1,10 @@
+<%@ 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-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="fck-editor" prefix="fck"%>
+
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_laqa/web/includes/css/tool_custom.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_laqa/web/includes/javascript/common.js
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/includes/javascript/common.js,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_laqa/web/includes/javascript/common.js	20 Sep 2006 15:08:31 -0000	1.1
@@ -0,0 +1,18 @@
+	function launchPopup(url,title) {
+		var wd = null;
+		if(wd && wd.open && !wd.closed){
+			wd.close();
+		}
+		wd = window.open(url,title,'resizable,width=796,height=570,scrollbars');
+		wd.window.focus();
+	}
+	function showBusy(targetDiv){
+		if($(targetDiv+"_Busy") != null){
+			Element.show(targetDiv+"_Busy");
+		}
+	}
+	function hideBusy(targetDiv){
+		if($(targetDiv+"_Busy") != null){
+			Element.hide(targetDiv+"_Busy");
+		}				
+	}
\ No newline at end of file
Index: lams_tool_laqa/web/includes/javascript/forum.js
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/includes/javascript/Attic/forum.js,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_laqa/web/includes/javascript/forum.js	20 Sep 2006 15:08:31 -0000	1.1
@@ -0,0 +1,18 @@
+	function launchPopup(url,title) {
+		var wd = null;
+		if(wd && wd.open && !wd.closed){
+			wd.close();
+		}
+		wd = window.open(url,title,'resizable,width=796,height=570,scrollbars');
+		wd.window.focus();
+	}
+	function showBusy(targetDiv){
+		if($(targetDiv+"_Busy") != null){
+			Element.show(targetDiv+"_Busy");
+		}
+	}
+	function hideBusy(targetDiv){
+		if($(targetDiv+"_Busy") != null){
+			Element.hide(targetDiv+"_Busy");
+		}				
+	}
\ No newline at end of file
Index: lams_tool_laqa/web/includes/javascript/message.js
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/includes/javascript/Attic/message.js,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_laqa/web/includes/javascript/message.js	20 Sep 2006 15:08:31 -0000	1.1
@@ -0,0 +1,31 @@
+	/*
+	 This is Resource Item instrcution area.
+	 */
+    var itemAttachmentTargetDiv = "itemAttachmentArea";
+// Please set these 1 variables in JSP file for using tag reason:
+//removeItemAttachmentUrl
+	function removeItemAttachment(){
+		//var id = "instructionItem" + idx;
+		//Element.remove(id);
+ 		var url= removeItemAttachmentUrl;
+	    var reqIDVar = new Date();
+	    var param = "reqID="+reqIDVar.getTime();
+	    removeItemAttachmentLoading();
+	    var myAjax = new Ajax.Updater(
+		    	itemAttachmentTargetDiv,
+		    	url,
+		    	{
+		    		method:'get',
+		    		parameters:param,
+		    		onComplete:removeItemAttachmentComplete,
+		    		evalScripts:true
+		    	}
+	    );
+	}
+	function removeItemAttachmentLoading(){
+		showBusy(itemAttachmentTargetDiv);
+	}
+	function removeItemAttachmentComplete(){
+		hideBusy(itemAttachmentTargetDiv);
+	}
+
Index: lams_tool_laqa/web/monitoring/editQuestionBox.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/monitoring/Attic/editQuestionBox.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_laqa/web/monitoring/editQuestionBox.jsp	20 Sep 2006 15:08:35 -0000	1.1
@@ -0,0 +1,112 @@
+<%--
+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 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
+--%>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
+
+<%@ include file="/common/taglibs.jsp"%>
+<html>
+	<head>
+		<%@ include file="/common/header.jsp"%>
+		
+		<script language="JavaScript" type="text/JavaScript">
+
+			function submitMethod() {
+				document.QaAuthoringForm.submit();
+			}
+			
+			function submitMethod(actionMethod) {
+				document.QaAuthoringForm.dispatch.value=actionMethod; 
+				document.QaAuthoringForm.submit();
+			}
+			
+		</script>		
+	</head>
+	
+	<body>
+		<table cellpadding="0">
+	
+
+			<html:form  action="/monitoring?validate=false" styleId="newQuestionForm" enctype="multipart/form-data" method="POST">			
+			<html:hidden property="dispatch" value="saveSingleQuestion"/>
+			<html:hidden property="toolContentID"/>
+			<html:hidden property="currentTab" styleId="currentTab" />
+			<html:hidden property="activeModule"/>
+			<html:hidden property="httpSessionID"/>								
+			<html:hidden property="defaultContentIdStr"/>								
+			<html:hidden property="defineLaterInEditMode"/>										
+			<html:hidden property="contentFolderID"/>														
+			<html:hidden property="editableQuestionIndex"/>														
+			<html:hidden property="editQuestionBoxRequest" value="true"/>																	
+
+		
+			<tr>
+			<td>
+			<table class="innerforms">
+		
+				<tr>
+					<td>
+						<div class="field-name" style="text-align: left;">
+							<fmt:message key="label.edit.question"></fmt:message>
+						</div>
+						
+						<lams:FCKEditor id="newQuestion"
+							value="${qaGeneralAuthoringDTO.editableQuestionText}"
+							contentFolderID="${qaGeneralAuthoringDTO.contentFolderID}"></lams:FCKEditor>
+					</td>
+				</tr>
+				
+
+				<tr>
+					<td>
+						<div class="field-name" style="text-align: left;">
+							<fmt:message key="label.feedback"></fmt:message>
+						</div>
+						<html:textarea property="feedback" rows="3" cols="60"></html:textarea>							
+					</td>
+				</tr>
+
+				<tr>
+					<td align="center" valign="bottom">
+						<a href="#" onclick="javascript:window.parent.hideMessage()" class="button">
+							<bean:message key="label.cancel" />
+						</a>
+
+						&nbsp; &nbsp;					
+                        
+						<a href="#" onclick="getElementById('newQuestionForm').submit();" class="button-add-item">
+							<bean:message key="label.save.question" />
+						</a>
+					
+						<BR><BR>
+					</td>
+				</tr>
+				
+
+			</table>				
+			</td>
+			</tr>
+				
+			</html:form>
+			
+		</table>
+
+	</body>
+</html>
Index: lams_tool_laqa/web/monitoring/itemlist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/monitoring/Attic/itemlist.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_laqa/web/monitoring/itemlist.jsp	20 Sep 2006 15:08:35 -0000	1.1
@@ -0,0 +1,104 @@
+<%--
+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 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
+--%>
+
+<%@ include file="/common/taglibs.jsp" %>
+<c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request"/>
+<div id="itemList">
+<h2><fmt:message key="label.questions" />
+<img src="${ctxPath}/includes/images/indicator.gif" style="display:none" id="resourceListArea_Busy" /></h2>
+
+<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
+<table id="itemTable" style="align:left;width:650px" >
+    <c:set var="queIndex" scope="request" value="0"/>
+    
+    
+    <c:forEach items="${listQuestionContentDTO}" var="currentDTO" varStatus="status">
+	<c:set var="queIndex" scope="request" value="${queIndex +1}"/>
+	<c:set var="question" scope="request" value="${currentDTO.question}"/>
+	<c:set var="feedback" scope="request" value="${currentDTO.feedback}"/>
+	<c:set var="displayOrder" scope="request" value="${currentDTO.displayOrder}"/>	
+
+	<tr>
+		<td width="10%" align="right" class="field-name">
+			<fmt:message key="label.question" />:
+		</td>
+
+		<td width="60%" align="left">
+			<c:out value="${question}" escapeXml="false"/> 
+		</td>		
+
+
+			<td width="10%" align="right">
+		 		<c:if test="${totalQuestionCount != 1}"> 		
+		 		
+			 		<c:if test="${queIndex == 1}"> 		
+						<a title="<bean:message key='label.tip.moveQuestionDown'/>" href="javascript:;" onclick="javascript:submitModifyMonitoringQuestion('<c:out value="${queIndex}"/>','moveQuestionDown');">
+		                            <img src="<c:out value="${tool}"/>images/down.gif" border="0">
+						</a> 
+					</c:if> 							
+	
+			 		<c:if test="${queIndex == totalQuestionCount}"> 		
+						<a title="<bean:message key='label.tip.moveQuestionUp'/>" href="javascript:;" onclick="javascript:submitModifyMonitoringQuestion('<c:out value="${queIndex}"/>','moveQuestionUp');">
+		                            <img src="<c:out value="${tool}"/>images/up.gif" border="0">
+						</a> 
+					</c:if> 							
+					
+					<c:if test="${(queIndex != 1)  && (queIndex != totalQuestionCount)}"> 		
+						<a title="<bean:message key='label.tip.moveQuestionDown'/>" href="javascript:;" onclick="javascript:submitModifyMonitoringQuestion('<c:out value="${queIndex}"/>','moveQuestionDown');">
+		                            <img src="<c:out value="${tool}"/>images/down.gif" border="0">
+						</a> 
+	
+						<a title="<bean:message key='label.tip.moveQuestionUp'/>" href="javascript:;" onclick="javascript:submitModifyMonitoringQuestion('<c:out value="${queIndex}"/>','moveQuestionUp');">
+		                            <img src="<c:out value="${tool}"/>images/up.gif" border="0">
+						</a> 
+					</c:if> 							
+				
+				</c:if> 			
+			</td>
+
+		
+		
+
+		<td width="10%" align="right">
+				<a title="<bean:message key='label.tip.editQuestion'/>" href="javascript:;" onclick="javascript:showMessage('<html:rewrite page="/monitoring.do?dispatch=newEditableQuestionBox&questionIndex=${queIndex}&contentFolderID=${qaGeneralAuthoringDTO.contentFolderID}&httpSessionID=${qaGeneralAuthoringDTO.httpSessionID}&toolContentID=${qaGeneralAuthoringDTO.toolContentID}&activeModule=${qaGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${qaGeneralAuthoringDTO.defaultContentIdStr}&synchInMonitor=${qaGeneralAuthoringDTO.synchInMonitor}&usernameVisible=${qaGeneralAuthoringDTO.usernameVisible}&questionsSequenced=${qaGeneralAuthoringDTO.questionsSequenced}"/>');">
+	                    <img src="<c:out value="${tool}"/>images/edit.gif" border="0">
+				</a> 
+		</td>
+
+		<td width="10%" align="right">
+				<a title="<bean:message key='label.tip.deleteQuestion'/>" href="javascript:;" onclick="removeMonitoringQuestion(${queIndex});">
+	                    <img src="<c:out value="${tool}"/>images/delete.gif" border="0">
+				</a> 				
+		</td>
+	</tr>
+</c:forEach>
+
+</table>
+</div>
+<%-- This script will works when a new resoruce item submit in order to refresh "Resource List" panel. --%>
+<script lang="javascript">
+ 
+	if(window.top != null){
+		window.top.hideMessage();
+		var obj = window.top.document.getElementById('resourceListArea');
+		obj.innerHTML= document.getElementById("itemList").innerHTML;
+	}
+</script>
+
Index: lams_tool_laqa/web/monitoring/newQuestionBox.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/monitoring/Attic/newQuestionBox.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_laqa/web/monitoring/newQuestionBox.jsp	20 Sep 2006 15:08:35 -0000	1.1
@@ -0,0 +1,109 @@
+<%--
+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 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
+--%>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
+
+<%@ include file="/common/taglibs.jsp"%>
+<html>
+	<head>
+		<%@ include file="/common/header.jsp"%>
+		
+		<script language="JavaScript" type="text/JavaScript">
+
+			function submitMethod() {
+				document.QaAuthoringForm.submit();
+			}
+			
+			function submitMethod(actionMethod) {
+				document.QaAuthoringForm.dispatch.value=actionMethod; 
+				document.QaAuthoringForm.submit();
+			}
+			
+		</script>		
+	</head>
+	
+	<body>
+		<table cellpadding="0">
+	
+
+			<html:form  action="/monitoring?validate=false" styleId="newQuestionForm" enctype="multipart/form-data" method="POST">				
+			<html:hidden property="dispatch" value="addSingleQuestion"/>
+			<html:hidden property="toolContentID"/>
+			<html:hidden property="currentTab" styleId="currentTab" />
+			<html:hidden property="activeModule"/>
+			<html:hidden property="httpSessionID"/>								
+			<html:hidden property="defaultContentIdStr"/>								
+			<html:hidden property="defineLaterInEditMode"/>										
+			<html:hidden property="contentFolderID"/>														
+			<html:hidden property="editQuestionBoxRequest" value="false"/>																				
+			
+			<tr>
+			<td>
+			<table class="innerforms">
+		
+				<tr>
+					<td>
+						<div class="field-name" style="text-align: left;">
+							<fmt:message key="label.add.new.question"></fmt:message>
+						</div>
+						<lams:FCKEditor id="newQuestion"
+							value="${qaGeneralAuthoringDTO.editableQuestionText}"
+							contentFolderID="${qaGeneralAuthoringDTO.contentFolderID}"></lams:FCKEditor>
+					</td>
+				</tr>
+				
+
+				<tr>
+					<td>
+						<div class="field-name" style="text-align: left;">
+							<fmt:message key="label.feedback"></fmt:message>
+						</div>
+						<html:textarea property="feedback" rows="3" cols="60"></html:textarea>							
+					</td>
+				</tr>
+				
+
+				<tr>
+					<td align="center" valign="bottom">
+						<a href="#" onclick="javascript:window.parent.hideMessage()" class="button">
+							<bean:message key="label.cancel" />
+						</a>
+
+						&nbsp; &nbsp;					
+                        
+						<a href="#" onclick="getElementById('newQuestionForm').submit();" class="button-add-item">
+							<bean:message key="label.save.question" />
+						</a>
+					
+						<BR><BR>
+					</td>
+				</tr>
+				
+
+			</table>				
+			</td>
+			</tr>
+				
+			</html:form>
+		</table>
+
+	</body>
+</html>