Index: lams_tool_scribe/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r84d0c4269817f6bab6c499a134d1162dda35deb8 -r1bddf2af8d3cd3191a23d54a718bd3f313cb1aea
--- lams_tool_scribe/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 84d0c4269817f6bab6c499a134d1162dda35deb8)
+++ lams_tool_scribe/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 1bddf2af8d3cd3191a23d54a718bd3f313cb1aea)
@@ -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
===================================================================
diff -u -r0edacde89fb315c54ed60643a06ef7d3e7b5bb89 -r1bddf2af8d3cd3191a23d54a718bd3f313cb1aea
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java (.../LearningAction.java) (revision 0edacde89fb315c54ed60643a06ef7d3e7b5bb89)
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java (.../LearningAction.java) (revision 1bddf2af8d3cd3191a23d54a718bd3f313cb1aea)
@@ -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
===================================================================
diff -u -r0697c7a71301d7d5d468f4051de6761cf5904606 -r1bddf2af8d3cd3191a23d54a718bd3f313cb1aea
--- lams_tool_scribe/web/WEB-INF/struts/tiles-defs.xml (.../tiles-defs.xml) (revision 0697c7a71301d7d5d468f4051de6761cf5904606)
+++ lams_tool_scribe/web/WEB-INF/struts/tiles-defs.xml (.../tiles-defs.xml) (revision 1bddf2af8d3cd3191a23d54a718bd3f313cb1aea)
@@ -119,6 +119,10 @@
+
+
+
+
Index: lams_tool_scribe/web/pages/learning/waitForScribe.jsp
===================================================================
diff -u
--- lams_tool_scribe/web/pages/learning/waitForScribe.jsp (revision 0)
+++ lams_tool_scribe/web/pages/learning/waitForScribe.jsp (revision 1bddf2af8d3cd3191a23d54a718bd3f313cb1aea)
@@ -0,0 +1,15 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+
+