Index: lams_learning/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r79fe47182d70b6bbd8d9fe0f7b4bd83ee64edb21 -r753b952ef68db777c6278b3996e433291ef12617
--- lams_learning/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 79fe47182d70b6bbd8d9fe0f7b4bd83ee64edb21)
+++ lams_learning/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 753b952ef68db777c6278b3996e433291ef12617)
@@ -85,6 +85,9 @@
export.portfolio.generation.complete.message =Export Portfolio completed
message.activity.options.note =Note: Once you finish any of the above activities you can revisit them by using the progress bar.
message.activity.options.note.maximum =Note: The maximum number of activities you may attempt is {0}. You can revisit started or finished activities by using the progress bar.
+message.activity.set.options.activityCount =You must complete at least {0} out of {1} sets of activities to finish.
+message.activity.set.options.note =Note: Once you finish any of the above sets of activities you can revisit them by using the progress bar.
+message.activity.set.options.note.maximum =Note: The maximum number of sets of activities you may attempt is {0}. You can revisit started or finished sets of activities by using the progress bar.
#======= End labels: Exported 79 labels for en AU =====
Index: lams_learning/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r79fe47182d70b6bbd8d9fe0f7b4bd83ee64edb21 -r753b952ef68db777c6278b3996e433291ef12617
--- lams_learning/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 79fe47182d70b6bbd8d9fe0f7b4bd83ee64edb21)
+++ lams_learning/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 753b952ef68db777c6278b3996e433291ef12617)
@@ -85,6 +85,8 @@
export.portfolio.generation.complete.message =Export Portfolio completed
message.activity.options.note =Note: Once you finish any of the above activities you can revisit them by using the progress bar.
message.activity.options.note.maximum =Note: The maximum number of activities you may attempt is {0}. You can revisit started or finished activities by using the progress bar.
+message.activity.set.options.activityCount =You must complete at least {0} out of {1} sets of activities to finish.
+message.activity.set.options.note =Note: Once you finish any of the above sets of activities you can revisit them by using the progress bar.
+message.activity.set.options.note.maximum =Note: The maximum number of sets of activities you may attempt is {0}. You can revisit started or finished sets of activities by using the progress bar.
-
#======= End labels: Exported 79 labels for en AU =====
Index: lams_learning/web/optionsActivity.jsp
===================================================================
diff -u -r5a44360dff34381e19d14e6ff31cedf4901f4c3b -r753b952ef68db777c6278b3996e433291ef12617
--- lams_learning/web/optionsActivity.jsp (.../optionsActivity.jsp) (revision 5a44360dff34381e19d14e6ff31cedf4901f4c3b)
+++ lams_learning/web/optionsActivity.jsp (.../optionsActivity.jsp) (revision 753b952ef68db777c6278b3996e433291ef12617)
@@ -8,6 +8,12 @@
progress="${optionsActivityForm.progressSummary}" />
+<%
+ if (request.getAttribute("activity") instanceof org.lamsfoundation.lams.learningdesign.OptionsWithSequencesActivity) {
+ request.setAttribute("isOptionsWithSequencesActivity", "true");
+ }
+%>
+