Index: lams_tool_larsrc/conf/language/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/conf/language/Attic/ApplicationResources.properties,v diff -u -r1.23 -r1.24 --- lams_tool_larsrc/conf/language/ApplicationResources.properties 14 Jun 2006 23:53:38 -0000 1.23 +++ lams_tool_larsrc/conf/language/ApplicationResources.properties 14 Jul 2006 04:58:37 -0000 1.24 @@ -180,7 +180,7 @@ #======= 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. message.monitoring.summary.no.resource.for.group=No resource available for this group. button.try.again=Try again Index: lams_tool_larsrc/web/WEB-INF/tags/DefineLater.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/WEB-INF/tags/DefineLater.tag,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_larsrc/web/WEB-INF/tags/DefineLater.tag 14 Jul 2006 04:58:37 -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
+ */ +%> + +<%@ 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_larsrc/web/WEB-INF/tlds/lams/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld,v diff -u -r1.4 -r1.5 --- lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld 6 Jul 2006 04:37:03 -0000 1.4 +++ lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld 14 Jul 2006 04:58:37 -0000 1.5 @@ -310,5 +310,8 @@ ExportPortOutput /WEB-INF/tags/ExportPortOutput.tag - + + DefineLater + /WEB-INF/tags/DefineLater.tag + Index: lams_tool_larsrc/web/pages/learning/definelater.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/definelater.jsp,v diff -u -r1.3 -r1.4 --- lams_tool_larsrc/web/pages/learning/definelater.jsp 14 Jun 2006 23:53:38 -0000 1.3 +++ lams_tool_larsrc/web/pages/learning/definelater.jsp 14 Jul 2006 04:58:37 -0000 1.4 @@ -7,23 +7,23 @@ - - - - -
-

- ${resource.title} -

-

- ${resource.instructions} -

-
-
- -

- +

+

+ ${resource.title} +

+
+
+ + +
+ +
+ + + +
Index: lams_tool_nb/conf/language/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/conf/language/Attic/ApplicationResources.properties,v diff -u -r1.10 -r1.11 --- lams_tool_nb/conf/language/ApplicationResources.properties 28 Jun 2006 09:53:07 -0000 1.10 +++ lams_tool_nb/conf/language/ApplicationResources.properties 14 Jul 2006 04:56:51 -0000 1.11 @@ -29,7 +29,7 @@ link.view =View link.download =Download link.delete =Delete -message.defineLaterSet =Please wait for the teacher to complete the contents of this activity +message.defineLaterSet =Please wait for the teacher to complete the contents of this activity. message.runOfflineSet =This activity is not being done on the computer. Please see your instructor for details message.author.defineLaterSet1 =This feature is not available in the preview mode. message.author.defineLaterSet2 =The teacher will set the content of this noticeboard once the lesson is in progress. Please click on the "NEXT" button below to continue @@ -64,3 +64,5 @@ #===== New Labels added 28/06/06 label.save=Save label.cancel=Cancel +#======= Add on 14/07/2006 ===== +button.try.again =Try again \ No newline at end of file Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerStarterAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerStarterAction.java,v diff -u -r1.18 -r1.19 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerStarterAction.java 27 Jun 2006 00:57:38 -0000 1.18 +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerStarterAction.java 14 Jul 2006 04:56:51 -0000 1.19 @@ -75,6 +75,7 @@ * handler="org.lamsfoundation.lams.tool.noticeboard.web.CustomStrutsExceptionHandler" * @struts:action-forward name="displayLearnerContent" path=".learnerContent" * @struts:action-forward name="displayMessage" path=".message" + * @struts:action-forward name="defineLater" path=".defineLater" * ----------------XDoclet Tags-------------------- */ @@ -142,8 +143,12 @@ nbUser = nbService.retrieveNbUserBySession(userID, toolSessionID); + if ( isFlagSet(nbContent, NoticeboardConstants.FLAG_DEFINE_LATER) ) { + return mapping.findForward(NoticeboardConstants.DEFINE_LATER); + } + /* - * Checks to see if the defineLater or runOffline flag is set. + * Checks to see if the runOffline flag is set. * If the particular flag is set, control is forwarded to jsp page * displaying to the user the message according to what flag is set. */ Index: lams_tool_nb/web/defineLater.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/web/defineLater.jsp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_nb/web/defineLater.jsp 14 Jul 2006 04:56:51 -0000 1.1 @@ -0,0 +1,16 @@ +<%@ include file="/includes/taglibs.jsp"%> + +

 

+ +
+ +
+ + + +
+ + + + + Index: lams_tool_nb/web/header.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/web/header.jsp,v diff -u -r1.4 -r1.5 --- lams_tool_nb/web/header.jsp 28 Jun 2006 10:34:42 -0000 1.4 +++ lams_tool_nb/web/header.jsp 14 Jul 2006 04:56:51 -0000 1.5 @@ -1,26 +1 @@ -<%@ include file="/includes/taglibs.jsp"%> - - - - - - - - - - - - - - - - - - - - - - - - Index: lams_tool_nb/web/message.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/web/message.jsp,v diff -u -r1.5 -r1.6 --- lams_tool_nb/web/message.jsp 28 Jun 2006 10:34:42 -0000 1.5 +++ lams_tool_nb/web/message.jsp 14 Jul 2006 04:56:51 -0000 1.6 @@ -1,21 +1,13 @@ <%@ include file="/includes/taglibs.jsp"%> - - - - +

- - - -
- -
- +

+ - -

+ +

Index: lams_tool_nb/web/WEB-INF/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/web/WEB-INF/Attic/lams.tld,v diff -u -r1.6 -r1.7 --- lams_tool_nb/web/WEB-INF/lams.tld 6 Jul 2006 04:36:25 -0000 1.6 +++ lams_tool_nb/web/WEB-INF/lams.tld 14 Jul 2006 04:57:05 -0000 1.7 @@ -310,5 +310,8 @@ ExportPortOutput /WEB-INF/tags/ExportPortOutput.tag - + + DefineLater + /WEB-INF/tags/DefineLater.tag + Index: lams_tool_nb/web/WEB-INF/struts-config.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/web/WEB-INF/Attic/struts-config.xml,v diff -u -r1.17 -r1.18 --- lams_tool_nb/web/WEB-INF/struts-config.xml 15 May 2006 06:57:14 -0000 1.17 +++ lams_tool_nb/web/WEB-INF/struts-config.xml 14 Jul 2006 04:57:05 -0000 1.18 @@ -76,6 +76,11 @@ path=".message" 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_nb/web/WEB-INF/tiles/tiles-defs.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/web/WEB-INF/tiles/Attic/tiles-defs.xml,v diff -u -r1.14 -r1.15 --- lams_tool_nb/web/WEB-INF/tiles/tiles-defs.xml 1 Jul 2006 06:29:59 -0000 1.14 +++ lams_tool_nb/web/WEB-INF/tiles/tiles-defs.xml 14 Jul 2006 04:57:05 -0000 1.15 @@ -24,39 +24,32 @@ - - - - - - - - + + + - - \ No newline at end of file Index: lams_tool_nb/web/template/learnerTemplate.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/web/template/learnerTemplate.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_nb/web/template/learnerTemplate.jsp 1 Jul 2006 06:29:59 -0000 1.1 +++ lams_tool_nb/web/template/learnerTemplate.jsp 14 Jul 2006 04:56:51 -0000 1.2 @@ -12,14 +12,14 @@ - - - <fmt:message key="activity.title" /> + + <fmt:message key="activity.title"/> -
- -
+
+ + + Index: lams_tool_nb/web/template/template.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/web/template/template.jsp,v diff -u -r1.12 -r1.13 --- lams_tool_nb/web/template/template.jsp 28 Jun 2006 10:34:42 -0000 1.12 +++ lams_tool_nb/web/template/template.jsp 14 Jul 2006 04:56:51 -0000 1.13 @@ -12,28 +12,25 @@ - <fmt:message key="activity.title" /> -
- - - +

- +

-
+
+
- Index: lams_tool_sbmt/conf/language/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/conf/language/Attic/ApplicationResources.properties,v diff -u -r1.7 -r1.8 --- lams_tool_sbmt/conf/language/ApplicationResources.properties 27 Jun 2006 01:33:28 -0000 1.7 +++ lams_tool_sbmt/conf/language/ApplicationResources.properties 14 Jul 2006 04:54:04 -0000 1.8 @@ -103,7 +103,7 @@ 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. message.monitoring.edit.activity.not.editable=This Activity is no longer editable button.try.again=Try again Index: lams_tool_sbmt/web/learner/definelater.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/learner/definelater.jsp,v diff -u -r1.5 -r1.6 --- lams_tool_sbmt/web/learner/definelater.jsp 2 Jul 2006 01:25:14 -0000 1.5 +++ lams_tool_sbmt/web/learner/definelater.jsp 14 Jul 2006 04:54:04 -0000 1.6 @@ -25,18 +25,7 @@
- - - - -
-

- -

-
- -
-
+
Index: lams_tool_vote/conf/language/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/conf/language/Attic/ApplicationResources.properties,v diff -u -r1.44 -r1.45 --- lams_tool_vote/conf/language/ApplicationResources.properties 29 Jun 2006 00:38:11 -0000 1.44 +++ lams_tool_vote/conf/language/ApplicationResources.properties 14 Jul 2006 04:52:42 -0000 1.45 @@ -91,7 +91,7 @@ label.learner.nominations =Your nominations are: label.learning.forceOfflineMessage =This is an offline activity. Please 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.defaultContent.notSetup =Tool Activity Error! Can't continue. The default content for the tool has not been setup properly. @@ -139,4 +139,6 @@ #======= End labels: Exported 96 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 Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java,v diff -u -r1.30 -r1.31 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java 4 Jul 2006 00:03:52 -0000 1.30 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java 14 Jul 2006 04:50:06 -0000 1.31 @@ -277,7 +277,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_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/Attic/VoteUtils.java,v diff -u -r1.12 -r1.13 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java 13 Jun 2006 17:59:45 -0000 1.12 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java 14 Jul 2006 04:50:06 -0000 1.13 @@ -517,7 +517,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_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java,v diff -u -r1.25 -r1.26 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java 4 Jul 2006 00:03:50 -0000 1.25 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java 14 Jul 2006 04:50:06 -0000 1.26 @@ -266,10 +266,7 @@ if (isDefineLater == true) { VoteUtils.cleanUpSessionAbsolute(request); - request.getSession().setAttribute(USER_EXCEPTION_CONTENT_DEFINE_LATER, new Boolean(true).toString()); - logger.debug("warning to learner: the activity is defineLater, we interpret that the content is being modified."); - persistInRequestError(request,"error.defineLater"); - return (mapping.findForward(ERROR_LIST)); + return (mapping.findForward(DEFINE_LATER)); } /* Index: lams_tool_vote/web/WEB-INF/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/WEB-INF/Attic/lams.tld,v diff -u -r1.4 -r1.5 --- lams_tool_vote/web/WEB-INF/lams.tld 6 Jul 2006 04:33:37 -0000 1.4 +++ lams_tool_vote/web/WEB-INF/lams.tld 14 Jul 2006 04:50:05 -0000 1.5 @@ -310,5 +310,8 @@ ExportPortOutput /WEB-INF/tags/ExportPortOutput.tag - + + DefineLater + /WEB-INF/tags/DefineLater.tag + Index: lams_tool_vote/web/WEB-INF/struts-config.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/WEB-INF/struts-config.xml,v diff -u -r1.20 -r1.21 --- lams_tool_vote/web/WEB-INF/struts-config.xml 4 Jul 2006 00:04:24 -0000 1.20 +++ lams_tool_vote/web/WEB-INF/struts-config.xml 14 Jul 2006 04:50:05 -0000 1.21 @@ -270,6 +270,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_vote/web/learning/defineLater.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/defineLater.jsp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_vote/web/learning/defineLater.jsp 14 Jul 2006 04:50:06 -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" /> + + + +
+ +

 

+ +
+ +
+ +
+ + + + +
+ + + + + + + + + +