Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -r75ccded90a0064358457a15705aa8605e0553867 -rf1269ae0a26dba294ec02a457561b0b63447565e
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -r75ccded90a0064358457a15705aa8605e0553867 -rf1269ae0a26dba294ec02a457561b0b63447565e
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as
===================================================================
diff -u -rb47fd6dd5c2e5a38203cb21bd1b72c7b295d1a96 -rf1269ae0a26dba294ec02a457561b0b63447565e
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as	(.../Canvas.as)	(revision b47fd6dd5c2e5a38203cb21bd1b72c7b295d1a96)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as	(.../Canvas.as)	(revision f1269ae0a26dba294ec02a457561b0b63447565e)
@@ -869,6 +869,10 @@
 			Application.getInstance().getComms().sendAndReceive(_ddm.getDataForPreview(Dictionary.getValue('preview_btn'), null), "monitoring/initializeLesson", callback, false)
 		}
 	}
+	
+	public function arrangeActivitiesOnCanvas():Void {
+		canvasModel.arrangeActivities();
+	}
 
 	public function onInitPreviewResponse(r):Void{
 		if(r instanceof LFError) {
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
===================================================================
diff -u -r75bae9f675cec296dd7e79715454b0c09b593c21 -rf1269ae0a26dba294ec02a457561b0b63447565e
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision 75bae9f675cec296dd7e79715454b0c09b593c21)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision f1269ae0a26dba294ec02a457561b0b63447565e)
@@ -594,6 +594,7 @@
 	   
 					_canvasModel.openBranchActivityContent(ca, true);
 					Application.getInstance().getToolbar().setButtonState("support_act_btn", false, false);
+					LFMenuBar.getInstance().enableArrangeActivities(false);
 					
 					// invalidate design after opening tool content window
 					_canvasModel.getCanvas().ddm.validDesign = false;
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as
===================================================================
diff -u -r9d5eeace842b7971ad47f350fef71c0e11a352c0 -rf1269ae0a26dba294ec02a457561b0b63447565e
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as	(.../CanvasHelper.as)	(revision 9d5eeace842b7971ad47f350fef71c0e11a352c0)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as	(.../CanvasHelper.as)	(revision f1269ae0a26dba294ec02a457561b0b63447565e)
@@ -801,6 +801,9 @@
 		if (canvasModel.currentBranchingActivity == null && canvasModel.getReferenceActivityOnCanvas() == null) {
 			Application.getInstance().getToolbar().setButtonState("support_act_btn", true, false);
 		}
+		if (canvasModel.activeView instanceof CanvasView) {
+			LFMenuBar.getInstance().enableArrangeActivities(true);
+		}
 		
 		if(canvasModel.activeView instanceof CanvasComplexView)
 			CanvasComplexView(canvasModel.activeView).branchingToClear.push(branchingAct);
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
===================================================================
diff -u -r32d5c80db0ec654785f8bf867fdbaf99c236fb1d -rf1269ae0a26dba294ec02a457561b0b63447565e
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision 32d5c80db0ec654785f8bf867fdbaf99c236fb1d)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision f1269ae0a26dba294ec02a457561b0b63447565e)
@@ -1127,5 +1127,44 @@
 		
 		_lastBranchActionType = null;
 	}
-
+	
+	public function arrangeActivities():Void {
+		var orderedActUIIDs:Array = new Array();
+		
+		var currentActUIID:Number = getFirstActivityUIID();
+		while (currentActUIID != null) {
+			orderedActUIIDs.push(currentActUIID);
+			// get the next connected act uiid and assign it to the current act uiid
+			currentActUIID = getNextConnectedActivityUIID(currentActUIID);
+		}
+		
+		broadcastViewUpdate("ARRANGE_ACTIVITIES", orderedActUIIDs);
+	}
+	
+	public function getFirstActivityUIID():Number {
+		var transitionsOnCanvas:Array = _transitionsDisplayed.values();
+		var fromUIIDs:Array = new Array();
+		var toUIIDs:Hashtable = new Hashtable();
+		
+		for (var i=0; i<transitionsOnCanvas.length; i++) {
+			fromUIIDs.push(transitionsOnCanvas[i].transition.fromUIID);
+			toUIIDs.put(transitionsOnCanvas[i].transition.toUIID, null);
+		}
+		
+		for (var i=0; i<fromUIIDs.length; i++) {
+			if (!toUIIDs.containsKey(fromUIIDs[i]))
+				return fromUIIDs[i];
+		}
+		return null;
+	}
+	
+	public function getNextConnectedActivityUIID(currentActivityUIID:Number):Number {
+		var transitionsOnCanvas:Array = _transitionsDisplayed.values();
+		for (var i=0; i<transitionsOnCanvas.length; i++) {
+			if (transitionsOnCanvas[i].transition.fromUIID == currentActivityUIID) {
+				return transitionsOnCanvas[i].transition.toUIID;
+			}
+		}
+		return null;
+	}
 }
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as
===================================================================
diff -u -r7802a00a0a90a10ce3ac5429108d83a0fb12d7c7 -rf1269ae0a26dba294ec02a457561b0b63447565e
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as	(.../CanvasView.as)	(revision 7802a00a0a90a10ce3ac5429108d83a0fb12d7c7)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as	(.../CanvasView.as)	(revision f1269ae0a26dba294ec02a457561b0b63447565e)
@@ -141,6 +141,10 @@
 				Debugger.log('setting activie :' + event.updateType + " event.data: " + event.data + " condition: " + (event.data == this),Debugger.CRITICAL,'update','org.lamsfoundation.lams.CanvasView');
 				transparentCover._visible = (event.data == this) ? false : true;
 				break;
+			case 'ARRANGE_ACTIVITIES' :
+				//event.data contains an array activity UIIDs, ordered in terms of their position in the sequence on the current level of the design
+				if (cm.activeView instanceof CanvasView) { arrangeActivities(event.data, cm); }
+				break;
 			case 'DRAW_ALL' :
 				drawAll(event.data, cm);
 				break;
@@ -326,7 +330,7 @@
 					if (children[i].isReadOnly()) {
 						cm.getCanvas().ddm.getActivityByUIID(a.parentUIID).readOnly = true;
 						a.readOnly = true;
-					}
+					}
 				}
 			}
 			
@@ -487,6 +491,58 @@
 		lastScreenHeight = newHeight;
 	}
 	
+	public function arrangeActivities(orderedActivityUIIDArray:Array, cm:CanvasModel) {
+		var xInitialSpacing:Number = 20;
+		var xFirstActivityWidth:Number = 130; // this need only be approximate
+		var xCombinedInitialOffset:Number = xInitialSpacing + xFirstActivityWidth;
+		var xActivitySeparation:Number = 220;
+		var yRowSeparation:Number = 25;
+		
+		// the +1 is for the first activity which has already been taken into account in the xCombinedInitialOffset
+		var numActsPerRow:Number = Math.floor((canvas_scp.width - xCombinedInitialOffset)/xActivitySeparation) + 1;
+		var numRows:Number = Math.ceil(orderedActivityUIIDArray.length/numActsPerRow);
+		
+		//find row heights of each row based on the tallest activity in each row and put them in a hash table, 
+		//key = row number (starting at 0), value = tallest activity height
+		var rowHeightHash:Hashtable = new Hashtable();
+		for (var i=0; i<orderedActivityUIIDArray.length; i++) {			
+			var ca = cm.activitiesDisplayed.get(orderedActivityUIIDArray[i]);
+			var rowID:Number = Math.floor(i/numActsPerRow); // rows have id keys 0, 1, 2, 3...
+			var currentRowHeight = rowHeightHash.get(rowID);
+			
+			if (currentRowHeight == null || currentRowHeight < ca._height) {
+				rowHeightHash.put(rowID, ca._height);
+			}
+		}
+		
+		for (var i=0; i<orderedActivityUIIDArray.length; i++) {
+			var rowID:Number = Math.floor(i/numActsPerRow);
+			var yActivityOffset:Number = 35; // top vertical spacing for first row
+			var rowHeightHashKeys:Array = rowHeightHash.keys();
+			var ca = cm.activitiesDisplayed.get(orderedActivityUIIDArray[i]);
+			var act = ca.activity;
+			
+			for (var j=0; j<rowID; j++) {
+				yActivityOffset += (rowHeightHash.get(j)) + yRowSeparation;
+			}
+			
+			// position the activities
+			ca._x = xInitialSpacing + xActivitySeparation*(i%numActsPerRow);
+			ca._y = yActivityOffset + (rowHeightHash.get(rowID) - ca._height)/2; // horizontal alignment along the centre of each activity
+			act.xCoord = xInitialSpacing + xActivitySeparation*(i%numActsPerRow);
+			act.yCoord = yActivityOffset + (rowHeightHash.get(rowID) - ca._height)/2;
+		}
+		
+		var displayedTransitionsKeys:Array = cm.transitionsDisplayed.keys();
+		
+		for (var i=0; i<displayedTransitionsKeys.length; i++) {
+			var t = cm.transitionsDisplayed.remove(displayedTransitionsKeys[i]);
+			t.removeMovieClip();
+		}
+
+		cm.setDirty(); // refresh the design
+	}
+	
 	/**
 	 * Get the CSSStyleDeclaration objects for each component and apply them
 	 * directly to the instance
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/LFMenuBar.as
===================================================================
diff -u -r6d2d51b7f578f28803771fe67b913c4b86b83e45 -rf1269ae0a26dba294ec02a457561b0b63447565e
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/LFMenuBar.as	(.../LFMenuBar.as)	(revision 6d2d51b7f578f28803771fe67b913c4b86b83e45)
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/LFMenuBar.as	(.../LFMenuBar.as)	(revision f1269ae0a26dba294ec02a457561b0b63447565e)
@@ -178,8 +178,10 @@
         tools_menu.addMenuItem({label:Dictionary.getValue('mnu_tools_opt'), instanceName:"drawOptionalItem"});
         
 		tools_menu.addMenuItem({type:"separator"});
-		tools_menu.addMenuItem({label:Dictionary.getValue('competence_editor_dlg'), instanceName:"competenceEditor"});
+		tools_menu.addMenuItem({label:Dictionary.getValue('arrange_act_btn'), instanceName:"arrangeActivities"});
 		
+		tools_menu.addMenuItem({type:"separator"});
+		tools_menu.addMenuItem({label:Dictionary.getValue('competence_editor_dlg'), instanceName:"competenceEditor"});
 		//tools_menu.addMenuItem({type:"separator"});
         //tools_menu.addMenuItem({label:Dictionary.getValue('mnu_tools_prefs'), instanceName:"prefsItem", enabled:false});
 
@@ -411,6 +413,9 @@
 			case eventObj.menu.drawOptionalItem :
 				org.lamsfoundation.lams.authoring.Application(app).getCanvas().toggleOptionalActivity();
 				break;
+			case eventObj.menu.arrangeActivities :
+				org.lamsfoundation.lams.authoring.Application(app).getCanvas().arrangeActivitiesOnCanvas();
+				break;
 			case eventObj.menu.competenceEditor :
 				org.lamsfoundation.lams.authoring.Application(app).getCanvas().openCompetenceEditorWindow();
 				break;
@@ -468,6 +473,10 @@
 		file_menu.setMenuItemEnabled(file_menu.getMenuItemAt(2), enable);
 	}
 	
+	public function enableArrangeActivities(enable:Boolean){
+		tools_menu.setMenuItemEnabled(tools_menu.getMenuItemAt(3), enable);
+	}
+	
 	public function get fileMenu():Menu {
 		return file_menu;
 	}