+ */ +%> + +<%@ tag body-content="scriptless" %> +<%@ taglib uri="tags-fmt" prefix="fmt" %> +<%@ taglib uri="tags-core" prefix="c" %> + +<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true" %> +<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true" %> + +<%-- Default value for I18N keys --%> + + + + + + + +

+ +

Index: lams_tool_chat/web/pages/learning/defineLater.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/web/pages/learning/defineLater.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_chat/web/pages/learning/defineLater.jsp 10 Jul 2006 04:51:09 -0000 1.1 +++ lams_tool_chat/web/pages/learning/defineLater.jsp 14 Jul 2006 05:08:39 -0000 1.2 @@ -5,17 +5,7 @@

- - - - -

- message.defineLaterSet -

- -

Index: lams_tool_example/web/WEB-INF/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_example/web/WEB-INF/lams.tld,v diff -u -r1.3 -r1.4 --- lams_tool_example/web/WEB-INF/lams.tld 6 Jul 2006 04:38:26 -0000 1.3 +++ lams_tool_example/web/WEB-INF/lams.tld 14 Jul 2006 05:05:38 -0000 1.4 @@ -310,5 +310,8 @@ ExportPortOutput /WEB-INF/tags/ExportPortOutput.tag - + + DefineLater + /WEB-INF/tags/DefineLater.tag + Index: lams_tool_example/web/WEB-INF/tags/DefineLater.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_example/web/WEB-INF/tags/DefineLater.tag,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_example/web/WEB-INF/tags/DefineLater.tag 14 Jul 2006 05:05:38 -0000 1.1 @@ -0,0 +1,55 @@ +<% +/**************************************************************** + * 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.0 + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + + /** + * DefineLater.tag + * Author: Fiona Malikoff + * Description: Layout for "Define Later" screens - to be used in learning. + * A suggested layout - unless the tool has special requirements, this layout should be used. + * Expects to be used inside

+ +

Index: lams_tool_forum/conf/language/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/conf/language/Attic/ApplicationResources.properties,v diff -u -r1.7 -r1.8 --- lams_tool_forum/conf/language/ApplicationResources.properties 14 Jun 2006 23:53:08 -0000 1.7 +++ lams_tool_forum/conf/language/ApplicationResources.properties 14 Jul 2006 05:05:21 -0000 1.8 @@ -143,6 +143,6 @@ #======= New labels: after 12/05/2006 ============= authoring.msg.cancel.save=Do you want to close this window without saving? #======= New labels: after 08/06/2006 ============= -define.later.message=Please wait for the teacher to define this part. +define.later.message=Please wait for the teacher to complete the contents of this activity. run.offline.message=This activity is not being done on the computer. Please see your instructor for details. button.try.again=Try again \ No newline at end of file Index: lams_tool_forum/web/WEB-INF/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/WEB-INF/Attic/lams.tld,v diff -u -r1.7 -r1.8 --- lams_tool_forum/web/WEB-INF/lams.tld 6 Jul 2006 04:38:14 -0000 1.7 +++ lams_tool_forum/web/WEB-INF/lams.tld 14 Jul 2006 05:05:21 -0000 1.8 @@ -310,5 +310,8 @@ ExportPortOutput /WEB-INF/tags/ExportPortOutput.tag - + + DefineLater + /WEB-INF/tags/DefineLater.tag + Index: lams_tool_forum/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/WEB-INF/Attic/web.xml,v diff -u -r1.23 -r1.24 --- lams_tool_forum/web/WEB-INF/web.xml 3 Jul 2006 07:03:10 -0000 1.23 +++ lams_tool_forum/web/WEB-INF/web.xml 14 Jul 2006 05:05:21 -0000 1.24 @@ -220,7 +220,7 @@ - +

Secure Content @@ -299,12 +299,44 @@

+ + + + + Student + LEARNER + + + Student + TEACHER + + + + Can create/modify a learning design + AUTHOR + + + + Can running and monitoring a learning session + STAFF + + + + Can add/remove users to the system, set up classes of users for sessions + ADMIN + + + + Can add/remove users to the system, set up classes of users for sessions + SYSADMIN +

FORM

LAMS

/login.jsp + /login.jsp?failed=y

Index: lams_tool_forum/web/WEB-INF/tags/DefineLater.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/WEB-INF/tags/DefineLater.tag,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_forum/web/WEB-INF/tags/DefineLater.tag 14 Jul 2006 05:05:21 -0000 1.1 @@ -0,0 +1,55 @@ +<% +/**************************************************************** + * 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.0 + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + + /** + * DefineLater.tag + * Author: Fiona Malikoff + * Description: Layout for "Define Later" screens - to be used in learning. + * A suggested layout - unless the tool has special requirements, this layout should be used. + * Expects to be used inside

+ +

Index: lams_tool_forum/web/jsps/learning/definelater.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/definelater.jsp,v diff -u -r1.4 -r1.5 --- lams_tool_forum/web/jsps/learning/definelater.jsp 2 Jul 2006 04:14:27 -0000 1.4 +++ lams_tool_forum/web/jsps/learning/definelater.jsp 14 Jul 2006 05:05:21 -0000 1.5 @@ -1,23 +1,11 @@ <%@ include file="/includes/taglibs.jsp"%> -

- -

- - - - -

- -

Index: lams_tool_lamc/conf/language/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/conf/language/Attic/ApplicationResources.properties,v diff -u -r1.12 -r1.13 --- lams_tool_lamc/conf/language/ApplicationResources.properties 29 Jun 2006 00:47:10 -0000 1.12 +++ lams_tool_lamc/conf/language/ApplicationResources.properties 14 Jul 2006 05:04:11 -0000 1.13 @@ -189,7 +189,7 @@ label.response =Response label.learning.forceOfflineMessage =This is setup to be carried out offline. Plase see your instructor for details. label.learning.runOffline =This activity is not being done on the computer. Please see your instructor for details. -error.defineLater =Sorry, the activity's content is not ready yet. Please wait for the teacher to define this part. +error.defineLater =Please wait for the teacher to complete the contents of this activity error.toolSessionId.required =Tool Activity Error! Can't continue
URL is not complete. The Tool Activity requires a toolSession id. error.contentId.required =Tool Activity Error! Can't continue
URL is not complete. The Tool Activity requires a content id. error.authoringUser.notAvailable =Tool Activity Error! Can't continue. Tool Activity expects a user id. @@ -255,4 +255,6 @@ #======= End labels: Exported 226 labels for en AU ===== #======= Add on 16/05/2006 ===== -authoring.msg.cancel.save=Do you want to close this window without saving? \ No newline at end of file +authoring.msg.cancel.save=Do you want to close this window without saving? +#======= Add on 14/07/2006 ===== +button.try.again =Try again \ No newline at end of file Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java,v diff -u -r1.81 -r1.82 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java 24 Jun 2006 01:56:02 -0000 1.81 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java 14 Jul 2006 05:04:11 -0000 1.82 @@ -301,7 +301,6 @@ public static final String USER_EXCEPTION_CONTENT_IN_USE ="userExceptionContentInUse"; public static final String USER_EXCEPTION_CONTENT_BEING_MODIFIED ="userExceptionContentBeingModified"; public static final String USER_EXCEPTION_CONTENT_RUNOFFLINE ="userExceptionContentRunOffline"; - public static final String USER_EXCEPTION_CONTENT_DEFINE_LATER ="userExceptionContentDefineLater"; public static final String USER_EXCEPTION_MODE_INVALID ="userExceptionModeInvalid"; public static final String USER_EXCEPTION_QUESTION_EMPTY ="userExceptionQuestionEmpty"; public static final String USER_EXCEPTION_ANSWER_EMPTY ="userExceptionAnswerEmpty"; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java,v diff -u -r1.40 -r1.41 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java 21 Jun 2006 15:56:48 -0000 1.40 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java 14 Jul 2006 05:04:11 -0000 1.41 @@ -771,7 +771,6 @@ request.getSession().removeAttribute(USER_EXCEPTION_CONTENT_IN_USE); request.getSession().removeAttribute(USER_EXCEPTION_CONTENT_BEING_MODIFIED); request.getSession().removeAttribute(USER_EXCEPTION_CONTENT_RUNOFFLINE); - request.getSession().removeAttribute(USER_EXCEPTION_CONTENT_DEFINE_LATER); request.getSession().removeAttribute(USER_EXCEPTION_MODE_INVALID); request.getSession().removeAttribute(USER_EXCEPTION_QUESTION_EMPTY); request.getSession().removeAttribute(USER_EXCEPTION_ANSWER_EMPTY); Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java,v diff -u -r1.48 -r1.49 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java 25 Jun 2006 23:21:08 -0000 1.48 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java 14 Jul 2006 05:04:11 -0000 1.49 @@ -143,6 +143,12 @@ /> + + ExportPortOutput /WEB-INF/tags/ExportPortOutput.tag - + + DefineLater + /WEB-INF/tags/DefineLater.tag + Index: lams_tool_lamc/web/WEB-INF/struts-config.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/WEB-INF/struts-config.xml,v diff -u -r1.49 -r1.50 --- lams_tool_lamc/web/WEB-INF/struts-config.xml 16 May 2006 05:15:49 -0000 1.49 +++ lams_tool_lamc/web/WEB-INF/struts-config.xml 14 Jul 2006 05:04:11 -0000 1.50 @@ -250,6 +250,12 @@ /> + + + */ +%> + +<%@ tag body-content="scriptless" %> +<%@ taglib uri="tags-fmt" prefix="fmt" %> +<%@ taglib uri="tags-core" prefix="c" %> + +<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true" %> +<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true" %> + +<%-- Default value for I18N keys --%> + + + + + + + +

+ +

Index: lams_tool_lamc/web/learning/defineLater.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/defineLater.jsp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_lamc/web/learning/defineLater.jsp 14 Jul 2006 05:04:11 -0000 1.1 @@ -0,0 +1,65 @@ +<%-- +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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + USA + + http://www.gnu.org/licenses/gpl.txt +--%> + + + +<%@ include file="/common/taglibs.jsp"%> + + + + + + + + + + + + + <bean:message key="activity.title" /> + + + +

+ +

+ + + + +

+ + + + + + + + + + Index: lams_tool_laqa/conf/language/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/conf/language/Attic/ApplicationResources.properties,v diff -u -r1.9 -r1.10 --- lams_tool_laqa/conf/language/ApplicationResources.properties 29 Jun 2006 00:41:25 -0000 1.9 +++ lams_tool_laqa/conf/language/ApplicationResources.properties 14 Jul 2006 05:02:37 -0000 1.10 @@ -121,7 +121,7 @@ label.stats.totalAllGroups =Total count of all learners: label.learning.runOffline =This activity is not being done on the computer. Please see your instructor for details. label.learning.forceOfflineMessage =This is setup to be carried out offline. Plase see your instructor for details. -error.defineLater =Sorry, this activity's content is not ready yet.
Please wait for your teacher to make the content ready. +error.defineLater =Please wait for the teacher to complete the contents of this activity. error.toolSessionId.required =Tool Activity Error! Can't continue
URL is not complete. The Tool Activity requires a toolSession id. error.contentId.required =Tool Activity Error! Can't continue
URL is not complete. The Tool Activity requires a content id. error.authoringUser.notAvailable =Tool Activity Error! Can't continue. Tool Activity expects a user id. @@ -184,4 +184,6 @@ #======= End labels: Exported 160 labels for en AU ===== #======= Add on 16/05/2006 ===== -authoring.msg.cancel.save=Do you want to close this window without saving? \ No newline at end of file +authoring.msg.cancel.save=Do you want to close this window without saving? +#======= Add on 14/07/2006 ===== +button.try.again =Try again \ No newline at end of file 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.57 -r1.58 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java 2 Jul 2006 18:59:10 -0000 1.57 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java 14 Jul 2006 05:02:38 -0000 1.58 @@ -145,7 +145,6 @@ public static final String USER_EXCEPTION_NO_TOOL_SESSIONS ="userExceptionNoToolSessions"; public static final String USER_EXCEPTION_NO_STUDENT_ACTIVITY ="userExceptionNoStudentActivity"; public static final String USER_EXCEPTION_CONTENT_IN_USE ="userExceptionContentInUse"; - public static final String USER_EXCEPTION_CONTENT_DEFINE_LATER ="userExceptionContentDefineLater"; public static final String USER_EXCEPTION_RUN_OFFLINE ="userExceptionRunOffline"; public static final String USER_EXCEPTION_MODE_REQUIRED ="userExceptionModeRequired"; public static final String USER_EXCEPTION_MODE_INVALID ="userExceptionModeInvalid"; Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Attic/QaUtils.java,v diff -u -r1.42 -r1.43 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java 6 Jun 2006 16:07:27 -0000 1.42 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java 14 Jul 2006 05:02:38 -0000 1.43 @@ -554,7 +554,6 @@ request.getSession().removeAttribute(USER_EXCEPTION_NO_TOOL_SESSIONS); request.getSession().removeAttribute(USER_EXCEPTION_NO_STUDENT_ACTIVITY); request.getSession().removeAttribute(USER_EXCEPTION_CONTENT_IN_USE); - request.getSession().removeAttribute(USER_EXCEPTION_CONTENT_DEFINE_LATER); request.getSession().removeAttribute(USER_EXCEPTION_MODE_REQUIRED); request.getSession().removeAttribute(USER_EXCEPTION_RUN_OFFLINE); request.getSession().removeAttribute(USER_EXCEPTION_MODE_INVALID); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java,v diff -u -r1.38 -r1.39 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java 2 Jul 2006 23:50:03 -0000 1.38 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java 14 Jul 2006 05:02:38 -0000 1.39 @@ -153,6 +153,12 @@ redirect="true" /> + + - - - - - + - - - - - - - - - - - - - - + + + + + + + + - - - - + + +

- -

Index: lams_tool_laqa/web/WEB-INF/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/Attic/lams.tld,v diff -u -r1.10 -r1.11 --- lams_tool_laqa/web/WEB-INF/lams.tld 6 Jul 2006 04:37:26 -0000 1.10 +++ lams_tool_laqa/web/WEB-INF/lams.tld 14 Jul 2006 05:02:37 -0000 1.11 @@ -310,5 +310,8 @@ ExportPortOutput /WEB-INF/tags/ExportPortOutput.tag - + + DefineLater + /WEB-INF/tags/DefineLater.tag + Index: lams_tool_laqa/web/WEB-INF/struts-config.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/struts-config.xml,v diff -u -r1.30 -r1.31 --- lams_tool_laqa/web/WEB-INF/struts-config.xml 2 Jul 2006 18:59:11 -0000 1.30 +++ lams_tool_laqa/web/WEB-INF/struts-config.xml 14 Jul 2006 05:02:38 -0000 1.31 @@ -223,6 +223,12 @@ redirect="false" /> + + + */ +%> + +<%@ tag body-content="scriptless" %> +<%@ taglib uri="tags-fmt" prefix="fmt" %> +<%@ taglib uri="tags-core" prefix="c" %> + +<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true" %> +<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true" %> + +<%-- Default value for I18N keys --%> + + + + + + + +

+ +

Index: lams_tool_laqa/web/learning/AnswersContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/AnswersContent.jsp,v diff -u -r1.10 -r1.11 --- lams_tool_laqa/web/learning/AnswersContent.jsp 2 Jul 2006 18:59:10 -0000 1.10 +++ lams_tool_laqa/web/learning/AnswersContent.jsp 14 Jul 2006 05:02:37 -0000 1.11 @@ -70,40 +70,31 @@

- +

- -

+ +

Index: lams_tool_laqa/web/learning/defineLater.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/defineLater.jsp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_laqa/web/learning/defineLater.jsp 14 Jul 2006 05:02:37 -0000 1.1 @@ -0,0 +1,65 @@ +<%-- +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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + USA + + http://www.gnu.org/licenses/gpl.txt +--%> + + + +<%@ include file="/common/taglibs.jsp"%> + + + + + + + + + + + + + <bean:message key="activity.title" /> + + + +

+ +

+ + + + +

+ + + + + + + + + +