Index: lams_central/web/lams_preloader.swf
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/lams_preloader.swf,v
diff -u -r1.25 -r1.26
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/steps/WizardLessonDetailsView.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/steps/WizardLessonDetailsView.as,v
diff -u -r1.7 -r1.8
--- lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/steps/WizardLessonDetailsView.as 24 Nov 2008 00:11:19 -0000 1.7
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/steps/WizardLessonDetailsView.as 28 Nov 2008 03:29:14 -0000 1.8
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/steps/WizardOrganisationView.as,v
diff -u -r1.7 -r1.8
--- lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/steps/WizardOrganisationView.as 24 Nov 2008 00:11:19 -0000 1.7
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/steps/WizardOrganisationView.as 28 Nov 2008 03:29:14 -0000 1.8
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flex/GroupManager/src/GroupManager.mxml,v
diff -u -r1.3 -r1.4
--- lams_flash/src/central/flex/GroupManager/src/GroupManager.mxml 24 Nov 2008 00:18:53 -0000 1.3
+++ lams_flash/src/central/flex/GroupManager/src/GroupManager.mxml 28 Nov 2008 03:29:14 -0000 1.4
@@ -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/lams_wizard.swf
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/Attic/lams_wizard.swf,v
diff -u -r1.70 -r1.71
Binary files differ
Index: lams_monitoring/web/lams_wizard_library.swf
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/Attic/lams_wizard_library.swf,v
diff -u -r1.48 -r1.49
Binary files differ
Index: lams_monitoring/web/grouping/GroupManager.swf
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/grouping/GroupManager.swf,v
diff -u -r1.3 -r1.4
Binary files differ
Index: lams_monitoring/web/grouping/chosenGrouping.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/grouping/chosenGrouping.jsp,v
diff -u -r1.17 -r1.18
--- lams_monitoring/web/grouping/chosenGrouping.jsp 24 Nov 2008 00:15:01 -0000 1.17
+++ lams_monitoring/web/grouping/chosenGrouping.jsp 28 Nov 2008 03:29:15 -0000 1.18
@@ -63,13 +63,12 @@
-
-
-
-
-
-
+
+
+
+
+