Index: lams_central/web/lams_preloader.swf
===================================================================
diff -u -r6302ea176d59ceb6316c0e707dafd5d715303c8b -r41a9249149e7d832c81bee35278e5b0ffd2cb6f5
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/steps/WizardLessonDetailsView.as
===================================================================
diff -u -r12450cbea53946ad074ec52d10f5e94ae207e1f9 -r41a9249149e7d832c81bee35278e5b0ffd2cb6f5
--- lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/steps/WizardLessonDetailsView.as	(.../WizardLessonDetailsView.as)	(revision 12450cbea53946ad074ec52d10f5e94ae207e1f9)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/steps/WizardLessonDetailsView.as	(.../WizardLessonDetailsView.as)	(revision 41a9249149e7d832c81bee35278e5b0ffd2cb6f5)
@@ -105,7 +105,7 @@
 		time_lbl.text = Dictionary.getValue('time_lbl');
 		
 		schedule_btn.label = Dictionary.getValue('schedule_cb_lbl');
-		
+		learner_eliveedit_cb.label = Dictionary.getValue('wizard_learner_enLiveEdit_cb_lbl');
 		schedule_cb.label = Dictionary.getValue('schedule_cb_lbl');
 		learner_expp_cb.label = Dictionary.getValue('wizard_learner_expp_cb_lbl');
 		learner_enpres_cb.label = Dictionary.getValue('wizard_learner_enpres_cb_lbl');
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/steps/WizardOrganisationView.as
===================================================================
diff -u -r12450cbea53946ad074ec52d10f5e94ae207e1f9 -r41a9249149e7d832c81bee35278e5b0ffd2cb6f5
--- lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/steps/WizardOrganisationView.as	(.../WizardOrganisationView.as)	(revision 12450cbea53946ad074ec52d10f5e94ae207e1f9)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/steps/WizardOrganisationView.as	(.../WizardOrganisationView.as)	(revision 41a9249149e7d832c81bee35278e5b0ffd2cb6f5)
@@ -118,7 +118,9 @@
 		if (_learnerList) {
 			splitNbLearnersTotal_lbl.text = Dictionary.getValue('wizard_splitLearners_leanersInGroup_lbl') + " " + String(_learnerList.length);
 			splitLearnersPerLesson_lbl.text = Dictionary.getValue('wizard_splitLearners_LearnersPerLesson_lbl');
+			splitLearnersPerLesson_lbl.invalidate();
 			splitLearnersPerLesson_txi.text = "1";
+			splitLearnersPerLesson_txi._x = splitLearnersPerLesson_lbl._x + splitLearnersPerLesson_lbl._width + 8;
 			updateSplitSummaryLabel();
 			clearInterval(intervalSetupSplitLabels);
 		}
Index: lams_flash/src/central/flex/GroupManager/src/GroupManager.mxml
===================================================================
diff -u -r12450cbea53946ad074ec52d10f5e94ae207e1f9 -r41a9249149e7d832c81bee35278e5b0ffd2cb6f5
--- lams_flash/src/central/flex/GroupManager/src/GroupManager.mxml	(.../GroupManager.mxml)	(revision 12450cbea53946ad074ec52d10f5e94ae207e1f9)
+++ lams_flash/src/central/flex/GroupManager/src/GroupManager.mxml	(.../GroupManager.mxml)	(revision 41a9249149e7d832c81bee35278e5b0ffd2cb6f5)
@@ -187,6 +187,8 @@
 				languageXML = XML(Application.application.parameters.languageXML);
 				viewMode = stringToBool(Application.application.parameters.viewMode);
 				
+				//Alert.show("lessonID: " + lessonID + " activityID: " + activityID + " usedForBranching: " + usedForBranching + " mayDelete: " + mayDelete + " viewMode: " + viewMode);
+				
 				// initialize misc. stuff including events
 				mainDataGrid_dg.dataProvider = intialLearners;
 				mainDataGrid_dg.addEventListener(DragEvent.DRAG_DROP, dragDropHandler);
@@ -200,8 +202,11 @@
 					application.enabled = false;
 				}
 				else {
+					if(viewMode){
+						Alert.show(languageXML.language.entry.(@key=="label.grouping.popup.viewmode.message").name);
+					}
 					// if may not delete, alert the monitor that learners can be added but not removed from groups
-					if(!mayDelete){
+					else if(!mayDelete){
 						Alert.show(languageXML.language.entry.(@key=="label.grouping.popup.drag.selection.message").name);
 					}
 					
@@ -225,10 +230,10 @@
 			// initialize buttons and dragging depending on jsp conditions
 			private function initButtonsAndDragging():void {
 				// allow movement of students if deleting is allowed
-				mainDataGrid_dg.dragEnabled = true;
-				mainDataGrid_dg.dropEnabled = true;
-				mainDataGrid_dg.dragMoveEnabled = true;
-				mainDataGrid_dg.allowDragSelection = true;
+				mainDataGrid_dg.dragEnabled = !viewMode;
+				mainDataGrid_dg.dropEnabled = !viewMode;
+				mainDataGrid_dg.dragMoveEnabled = !viewMode;
+				mainDataGrid_dg.allowDragSelection = !viewMode;
 				
 				// if groups are being used for branching, if deletion is a nono or if branching/grouping is in view mode, disable add and remove buttons
 				if(usedForBranching || !mayDelete || viewMode) {
Index: lams_monitoring/web/grouping/GroupManager.swf
===================================================================
diff -u -r12450cbea53946ad074ec52d10f5e94ae207e1f9 -r41a9249149e7d832c81bee35278e5b0ffd2cb6f5
Binary files differ
Index: lams_monitoring/web/grouping/chosenGrouping.jsp
===================================================================
diff -u -r12450cbea53946ad074ec52d10f5e94ae207e1f9 -r41a9249149e7d832c81bee35278e5b0ffd2cb6f5
--- lams_monitoring/web/grouping/chosenGrouping.jsp	(.../chosenGrouping.jsp)	(revision 12450cbea53946ad074ec52d10f5e94ae207e1f9)
+++ lams_monitoring/web/grouping/chosenGrouping.jsp	(.../chosenGrouping.jsp)	(revision 41a9249149e7d832c81bee35278e5b0ffd2cb6f5)
@@ -63,13 +63,12 @@
 	</c:if>
 	
 	<P><STRONG><fmt:message key="label.grouping.general.instructions.heading"/></STRONG> <fmt:message key="label.grouping.general.instructions.line1"/></P>
-
-	<p><fmt:message key="label.grouping.general.instructions.line2"/></p>
-
-	<c:if test="${usedForBranching}">
-	<p><fmt:message key="label.grouping.general.instructions.branching"/></p>
-	</c:if>
 	
+	<c:choose>
+		<c:when test="${usedForBranching}"><p><fmt:message key="label.grouping.general.instructions.branching"/></p></c:when>
+		<c:otherwise><p><fmt:message key="label.grouping.general.instructions.line2"/></p></c:otherwise>
+	</c:choose>
+	
 	<div align="center">
 	<script language="JavaScript" type="text/javascript">
 		// Version check for the Flash Player that has the ability to start Player Product Install (6.0r65)
Index: lams_monitoring/web/grouping/viewGroups.jsp
===================================================================
diff -u -r12450cbea53946ad074ec52d10f5e94ae207e1f9 -r41a9249149e7d832c81bee35278e5b0ffd2cb6f5
--- lams_monitoring/web/grouping/viewGroups.jsp	(.../viewGroups.jsp)	(revision 12450cbea53946ad074ec52d10f5e94ae207e1f9)
+++ lams_monitoring/web/grouping/viewGroups.jsp	(.../viewGroups.jsp)	(revision 41a9249149e7d832c81bee35278e5b0ffd2cb6f5)
@@ -65,7 +65,7 @@
 		
 			AC_FL_RunContent(
 				"src", "<lams:LAMSURL/>/monitoring/grouping/playerProductInstall",
-				"FlashVars", "MMredirectURL="+MMredirectURL+'&MMplayerType='+MMPlayerType+'&MMdoctitle='+MMdoctitle+'&lessonID='+'${lessonID}'+'&activityID='+'${activityID}'+'&serverUrl=<lams:LAMSURL/>'+'&mayDelete='+'${mayDelete}'+'&usedForBranching='+'${usedForBranching}'+'&maxNumberOfGroups='+'${maxNumberOfGroups}'+'&languageXML='+"${languageXML}"+"",
+				"FlashVars", "MMredirectURL="+MMredirectURL+'&MMplayerType='+MMPlayerType+'&MMdoctitle='+MMdoctitle+'&lessonID='+'${lessonID}'+'&activityID='+'${activityID}'+'&serverUrl=<lams:LAMSURL/>'+'&mayDelete='+'${mayDelete}'+'&viewMode='+'${viewMode}'+'&usedForBranching='+'${usedForBranching}'+'&maxNumberOfGroups='+'${maxNumberOfGroups}'+'&languageXML='+"${languageXML}"+"",
 				"width", "640",
 				"height", "460",
 				"align", "middle",
@@ -82,7 +82,7 @@
 			// embed the Flash Content SWF when all tests are passed
 			AC_FL_RunContent(
 					"src", "<lams:LAMSURL/>/monitoring/grouping/GroupManager",
-					"FlashVars", "lessonID="+'${lessonID}'+'&activityID='+'${activityID}'+'&serverUrl=<lams:LAMSURL/>'+'&mayDelete='+'${mayDelete}'+'&usedForBranching='+'${usedForBranching}'+'&maxNumberOfGroups='+'${maxNumberOfGroups}'+'&languageXML='+"${languageXML}"+"",
+					"FlashVars", "lessonID="+'${lessonID}'+'&activityID='+'${activityID}'+'&serverUrl=<lams:LAMSURL/>'+'&mayDelete='+'${mayDelete}'+'&viewMode='+'${viewMode}'+'&usedForBranching='+'${usedForBranching}'+'&maxNumberOfGroups='+'${maxNumberOfGroups}'+'&languageXML='+"${languageXML}"+"",
 					"width", "640",
 					"height", "460",
 					"align", "middle",
Index: lams_monitoring/web/lams_wizard.swf
===================================================================
diff -u -re067b86460735bebd9946535668f0482c5a577cc -r41a9249149e7d832c81bee35278e5b0ffd2cb6f5
Binary files differ
Index: lams_monitoring/web/lams_wizard_library.swf
===================================================================
diff -u -re067b86460735bebd9946535668f0482c5a577cc -r41a9249149e7d832c81bee35278e5b0ffd2cb6f5
Binary files differ