Index: lams_tool_scribe/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.15 -r1.15.6.1
--- lams_tool_scribe/conf/language/lams/ApplicationResources.properties 19 Nov 2008 18:39:25 -0000 1.15
+++ lams_tool_scribe/conf/language/lams/ApplicationResources.properties 21 Apr 2009 06:58:56 -0000 1.15.6.1
@@ -99,7 +99,8 @@
heading.totalLearnersInGroup =Total Number of Learners in Group:
message.summary =There is no summary available for this tool.
message.confirmForceComplete =Are you sure you want to Force Complete? If you click OK, you will not be able to change the Report text, and other Learners can no longer click Agree
-message.defineLaterSet =Please wait for the teacher to select the Scribe for this activity
+message.defineLaterSet =Please wait for the teacher to complete the contents of this activity
+message.waitForScribe = Please wait for the teacher to select the Scribe for this activity
advanced.showAggregatedReports =Show aggregated reports for all groupings.
Note: this will only work when groups are assigned to this activity.
heading.other.group.reports =Other Groups
message.runOfflineSet =This activity is not being done on the computer. Please see your instructor for details.
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java,v
diff -u -r1.13 -r1.13.6.1
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java 16 Nov 2007 07:49:40 -0000 1.13
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java 21 Apr 2009 06:58:56 -0000 1.13.6.1
@@ -75,6 +75,7 @@
* @struts.action-forward name="scribe" path="tiles:/learning/scribe"
* @struts.action-forward name="runOffline" path="tiles:/learning/runOffline"
* @struts.action-forward name="defineLater" path="tiles:/learning/defineLater"
+ * @struts.action-forward name="waitForScribe" path="tiles:/learning/waitForScribe"
* @struts.action-forward name="notebook" path="tiles:/learning/notebook"
* @struts.action-forward name="voteDisplay" path="/pages/parts/voteDisplay.jsp"
* @struts.action-forward name="report" path="tiles:/learning/report"
@@ -142,7 +143,7 @@
if (scribe.isAutoSelectScribe() == false) {
// learner needs to wait until a scribe has been appointed by
// teacher.
- return mapping.findForward("defineLater");
+ return mapping.findForward("waitForScribe");
} else {
// appoint the currentUser as the scribe
Index: lams_tool_scribe/web/WEB-INF/struts/tiles-defs.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/WEB-INF/struts/Attic/tiles-defs.xml,v
diff -u -r1.7 -r1.7.8.1
--- lams_tool_scribe/web/WEB-INF/struts/tiles-defs.xml 16 Oct 2006 06:09:43 -0000 1.7
+++ lams_tool_scribe/web/WEB-INF/struts/tiles-defs.xml 21 Apr 2009 06:58:56 -0000 1.7.8.1
@@ -119,6 +119,10 @@
+
+
+
+
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_tool_scribe/web/pages/learning/waitForScribe.jsp'.
Fisheye: No comparison available. Pass `N' to diff?