Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -r5cd45833dbbf97b54931280286b815a87b26b1c4 -rc8daa528b2fc8459b73d048ddfeb3c0daf4f78c3
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -r5cd45833dbbf97b54931280286b815a87b26b1c4 -rc8daa528b2fc8459b73d048ddfeb3c0daf4f78c3
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
===================================================================
diff -u -rbf43d38cb2b81bd0cd46b7b78652a4109ea6984d -rc8daa528b2fc8459b73d048ddfeb3c0daf4f78c3
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	(.../CanvasBranchView.as)	(revision bf43d38cb2b81bd0cd46b7b78652a4109ea6984d)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	(.../CanvasBranchView.as)	(revision c8daa528b2fc8459b73d048ddfeb3c0daf4f78c3)
@@ -557,7 +557,7 @@
 		else if(a.isBranchingActivity()) {	
 			BranchingActivity(a).clear = activity.clear;
 			
-			var newActivity_mc = (_module != "monitoring") ? activityLayer.createChildAtDepth("CanvasBranchingActivity",DepthManager.kTop,{_activity:a, _canvasController:cbc,_canvasBranchView:cbv})
+			var newActivity_mc = (_module != "monitoring") ? activityLayer.createChildAtDepth("CanvasBranchingActivity",DepthManager.kTop,{_activity:a, _canvasController:cbc,_canvasBranchView:cbv, showDiagram: true})
 															: activityLayer.createChildAtDepth("CanvasBranchingActivity",DepthManager.kTop,{_activity:a, _monitorController:cbc,_canvasBranchView:cbv, _module:_module, learnerContainer:_learnerContainer_mc});
 															
 			cm.activitiesDisplayed.put(a.activityUIID,newActivity_mc);
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchingDiagram.as
===================================================================
diff -u -rbf43d38cb2b81bd0cd46b7b78652a4109ea6984d -rc8daa528b2fc8459b73d048ddfeb3c0daf4f78c3
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchingDiagram.as	(.../CanvasBranchingDiagram.as)	(revision bf43d38cb2b81bd0cd46b7b78652a4109ea6984d)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchingDiagram.as	(.../CanvasBranchingDiagram.as)	(revision c8daa528b2fc8459b73d048ddfeb3c0daf4f78c3)
@@ -38,7 +38,8 @@
  **/
 class CanvasBranchingDiagram extends MovieClip  {
 	
-	private static var CIRCLE_SIZE:Number = 3;
+	//private static var CIRCLE_SIZE:Number = 3;
+	private static var ACT_SIZE:Number = 4;
 	private static var BRANCH_LIMIT:Number = 5;
 	
 	private static var ACTIVITY_LIMIT:Number = 6;
@@ -101,34 +102,44 @@
 			
 			// draw activityless
 			for(var i=0; i < _branchingDetails.length; i++) {
-				if(_branchingDetails[i].noOfActivities == 0) {
+				if(_branchingDetails[i].firstActivityUIID == null) {
 					activitylessToBeDrawn = true;
 				}
 			}
 			
 			for(var i=0; (i < _branchingDetails.length && i < BRANCH_LIMIT); i++) {
-				if(_branchingDetails[i].noOfActivities > 0) {
+				if(_branchingDetails[i].firstActivityUIID != null) {
 					setPointAction(true, false, false);
 						
 					var count:Number = (activitylessDrawn && i==1) ? i-1 : i;
 					count = (activitylessToBeDrawn && !activitylessDrawn && i>=1) ? count+1 : count;
 					
-					for(var j=1; (j <= _branchingDetails[i].noOfActivities && j <= ACTIVITY_LIMIT); j++) {
+					var j = 1;
+					
+					var nextActivity:Activity = _ddm.getActivityByUIID(_branchingDetails[i].firstActivityUIID);
+					
+					while(j <= ACTIVITY_LIMIT && nextActivity != null) {
 						line_mc.lineTo(MARGIN_X+(j*SPACING), MARGIN_Y+(SPACING*count));
 						
-						if(j == ACTIVITY_LIMIT && _branchingDetails[i].noOfActivities > ACTIVITY_LIMIT) {
-							drawCircle(container, MARGIN_X+(j*SPACING), MARGIN_Y+(SPACING*count), CIRCLE_SIZE, true);
-							line_mc.moveTo(MARGIN_X+(j*SPACING) + (CIRCLE_SIZE*4) + 1, MARGIN_Y+(SPACING*count));
-						} else if((j == ACTIVITY_LIMIT || j == _branchingDetails[i].noOfActivities) && !_branchingDetails[i].hasEndBranch) {
-							drawCircle(container, MARGIN_X+(j*SPACING), MARGIN_Y+(SPACING*count), CIRCLE_SIZE, false, true);
+						var assocColorObj:Object = getAssociatedStyle(nextActivity);
+						
+						if(j == ACTIVITY_LIMIT && _branchingDetails[i].noActivities > ACTIVITY_LIMIT) {
+							drawActivity(container, MARGIN_X+(j*SPACING), MARGIN_Y+(SPACING*count), ACT_SIZE, true, false, assocColorObj);
+							line_mc.moveTo(MARGIN_X+(j*SPACING) + (ACT_SIZE*4) + 1, MARGIN_Y+(SPACING*count));
+						} else if((j == ACTIVITY_LIMIT || j == _branchingDetails[i].noActivities) && !_branchingDetails[i].hasEndBranch) {
+							drawActivity(container, MARGIN_X+(j*SPACING), MARGIN_Y+(SPACING*count), ACT_SIZE, false, true, assocColorObj);
 						} else {
-							drawCircle(container, MARGIN_X+(j*SPACING), MARGIN_Y+(SPACING*count), CIRCLE_SIZE);
+							drawActivity(container, MARGIN_X+(j*SPACING), MARGIN_Y+(SPACING*count), ACT_SIZE, false, false, assocColorObj);
 						}
+						
+						nextActivity = getNextActivity(nextActivity.activityUIID);
+						
+						j++;
 					}
 					
 					if(_branchingDetails[i].hasEndBranch) setPointAction(false, true, true); // end point
 					
-				} else if(_branchingDetails[i].noOfActivities == 0) {
+				} else {
 					setPointAction(true, false, false);
 					setPointAction(false, true, true);
 					
@@ -140,6 +151,11 @@
 		setPosition();
 	}
 	
+	private function getNextActivity(activityUIID:Number):Activity {
+		var transitionObj:Object = _ddm.getTransitionsForActivityUIID(activityUIID);
+		return _ddm.getActivityByUIID(transitionObj.out.toUIID);
+	}
+	
 	private function setPointAction(_moveTo:Boolean, _lineTo:Boolean, _isEnd:Boolean):Object {
 		var p:Object = new Object();
 		p.x = (_isEnd) ? MARGIN_X+((ACTIVITY_LIMIT+1)*SPACING) : MARGIN_X;
@@ -159,16 +175,15 @@
 		Debugger.log("activity: " + _branchingActivity.activityUIID, Debugger.CRITICAL, "getDetails", "CanvasBranchingDiagram");
 		
 		var sequences:Array = _ddm.getComplexActivityChildren(_branchingActivity.activityUIID);
-		Debugger.log("no seqs: " + sequences.length, Debugger.CRITICAL, "getDetails", "CanvasBranchingDiagram");
+		
 		if(sequences.length > 0) { 
 			_empty = false;
 			
 			for(var i=0; i<sequences.length; i++) {
-				 var noActs:Number = _ddm.getComplexActivityChildren(sequences[i].activityUIID).length;
-				 Debugger.log("no acts: " + noActs, Debugger.CRITICAL, "getDetails", "CanvasBranchingDiagram");
+				 var acts:Array = _ddm.getComplexActivityChildren(sequences[i].activityUIID);
 				 
 				 if(!SequenceActivity(sequences[i]).isDefault)
-					_branchingDetails.push({noOfActivities: noActs, hasEndBranch: !sequences[i].stopAfterActivity});
+					_branchingDetails.push({firstActivityUIID: SequenceActivity(sequences[i]).firstActivityUIID, noActivities: acts.length, hasEndBranch: !sequences[i].stopAfterActivity});
 			}
 		} 
 		
@@ -203,18 +218,19 @@
 		var startPoint:Object = setPointAction(false, false, false);
 		var endPoint:Object = setPointAction(false, false, true);
 		
-		drawCircle(container, startPoint.x, startPoint.y, CIRCLE_SIZE);
-		drawCircle(container, endPoint.x, endPoint.y, CIRCLE_SIZE);
+		drawActivity(container, startPoint.x, startPoint.y, ACT_SIZE);
+		drawActivity(container, endPoint.x, endPoint.y, ACT_SIZE);
 	}
 	
+	/**
 	private function drawCircle(mc:MovieClip, x:Number, y:Number, r:Number, indicateMore:Boolean, indicateStops:Boolean):Void {
 		  
 		  
 		  if(indicateStops) mc.lineStyle(0, stopColor);
 		  else mc.lineStyle(0, lineColor);
 		  
 		  if(indicateStops) mc.beginFill(stopColor);
-		  else mc.beginFill(lineColor);
+		  else mc.beginFill(fillColor);
 		  
 		  mc.moveTo(x+r, y);
 		  mc.curveTo(r+x, Math.tan(Math.PI/8)*r+y, Math.sin(Math.PI/4)*r+x, Math.sin(Math.PI/4)*r+y);
@@ -233,7 +249,63 @@
 		 }
 		  
 	}
+	*/
 	
+	private function drawActivity(mc:MovieClip, x:Number, y:Number, r:Number, indicateMore:Boolean, indicateStops:Boolean, useAssocColor:Object):Void {
+		  if(indicateStops) mc.lineStyle(0.5, stopColor);
+		  else mc.lineStyle(0.5, lineColor);
+		  
+		  if(useAssocColor != null) mc.beginFill(useAssocColor.backgroundColor);
+		  else mc.beginFill(fillColor);
+		  
+		  mc.moveTo(x-r, y-r);
+		  mc.lineTo(x+r, y-r);
+		  mc.lineTo(x+r, y+r);
+		  mc.lineTo(x-r, y+r);
+		  mc.lineTo(x-r, y-r);
+		  
+		  if(indicateMore) {
+			 drawActivity(mc, x+(ACT_SIZE*2)+1, y, ACT_SIZE-1);
+			 drawActivity(mc, x+(ACT_SIZE*4)+1, y, ACT_SIZE-2);
+		 }
+	}
+	
+	private function getAssociatedStyle(_activity:Activity):Object{
+		var styleObj:Object = new Object();
+		
+		if(_root.actColour == "true") {
+			switch (String(_activity.activityCategoryID)){
+				case '0' :
+					styleObj = _tm.getStyleObject('ACTPanel0')
+					break;
+				case '1' :
+					styleObj = _tm.getStyleObject('ACTPanel1')
+					break;
+				case '2' :
+					styleObj = _tm.getStyleObject('ACTPanel2')
+					break;
+				case '3' :
+					styleObj = _tm.getStyleObject('ACTPanel5')
+					break;
+				case '4' :
+					styleObj = _tm.getStyleObject('ACTPanel4')
+					break;
+				case '5' :
+					styleObj = _tm.getStyleObject('ACTPanel1')
+					break;
+				case '6' :
+					styleObj = _tm.getStyleObject('ACTPanel3')
+					break;
+				default :
+					styleObj = _tm.getStyleObject('ACTPanel0')
+			}
+		} else {
+			styleObj = _tm.getStyleObject('ACTPanel');
+		}
+		
+		return styleObj;
+	}
+	
 	public function get empty():Boolean {
 		return _empty;
 	}
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as
===================================================================
diff -u -rcc02ac84bd5aa96036043f5930cc6e92972592cf -rc8daa528b2fc8459b73d048ddfeb3c0daf4f78c3
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as	(.../CanvasActivity.as)	(revision cc02ac84bd5aa96036043f5930cc6e92972592cf)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as	(.../CanvasActivity.as)	(revision c8daa528b2fc8459b73d048ddfeb3c0daf4f78c3)
@@ -97,6 +97,7 @@
 	private var icon_mcl:MovieClipLoader;
 	
 	private var diagram_mc:CanvasBranchingDiagram;
+	private var showDiagram:Boolean;
 	
 	private var bkg_pnl:MovieClip;
 	private var act_pnl:MovieClip;
@@ -157,12 +158,12 @@
 		} else if(_activity.isGroupActivity()){
 			_visibleHeight = (_sequenceChild) ? CanvasActivity.TOOL_MIN_ACTIVITY_HEIGHT : CanvasActivity.TOOL_ACTIVITY_HEIGHT;
 			_visibleWidth = (_sequenceChild) ? CanvasActivity.TOOL_MIN_ACTIVITY_WIDTH : CanvasActivity.TOOL_ACTIVITY_WIDTH;
-		} else if(_activity.isBranchingActivity()) {
-			_visibleHeight = (_sequenceChild) ? CanvasActivity.TOOL_MIN_ACTIVITY_HEIGHT : CanvasActivity.TOOL_BRANCHING_HEIGHT;
-			_visibleWidth = (_sequenceChild) ? CanvasActivity.TOOL_MIN_ACTIVITY_WIDTH :CanvasActivity.TOOL_BRANCHING_WIDTH;
+		} else if(_activity.isBranchingActivity() && showDiagram) {
+			_visibleHeight = CanvasActivity.TOOL_BRANCHING_HEIGHT;
+			_visibleWidth = CanvasActivity.TOOL_BRANCHING_WIDTH;
 		}else{
 			_visibleHeight = (_sequenceChild) ? CanvasActivity.TOOL_MIN_ACTIVITY_HEIGHT : CanvasActivity.TOOL_ACTIVITY_HEIGHT;
-			_visibleWidth = (_sequenceChild) ? CanvasActivity.TOOL_MIN_ACTIVITY_WIDTH :CanvasActivity.TOOL_ACTIVITY_WIDTH;
+			_visibleWidth = (_sequenceChild) ? CanvasActivity.TOOL_MIN_ACTIVITY_WIDTH : CanvasActivity.TOOL_ACTIVITY_WIDTH;
 		}
 		
 		_base_mc = this;
@@ -207,7 +208,7 @@
 		
 		if(!_activity.isGateActivity() && !_activity.isGroupActivity() && !_activity.isBranchingActivity() || _branchConnector){
 			loadIcon();
-		} else if(_activity.isBranchingActivity()) {
+		} else if(_activity.isBranchingActivity() && showDiagram) {
 			loadDiagram();
 		}
 		
@@ -485,12 +486,12 @@
 			} else if(_activity.isBranchingActivity()){
 				Debugger.log("empty: " + diagram_mc.empty, Debugger.CRITICAL, "draw", "CanvasActivity");
 				
-				branchIcon_mc._visible = diagram_mc.empty;
+				branchIcon_mc._visible = (diagram_mc.empty != null) ? diagram_mc.empty : true;
 				groupIcon_mc._visible = false;
 				optionalIcon_mc.visible = false;
 				icon_mc._visible = false;
 				
-				if(!diagram_mc.empty)
+				if(!branchIcon_mc._visible)
 					diagram_mc._visible = true;
 				else
 					theIcon_mc = branchIcon_mc;
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as
===================================================================
diff -u -rbf43d38cb2b81bd0cd46b7b78652a4109ea6984d -rc8daa528b2fc8459b73d048ddfeb3c0daf4f78c3
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as	(.../CanvasView.as)	(revision bf43d38cb2b81bd0cd46b7b78652a4109ea6984d)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as	(.../CanvasView.as)	(revision c8daa528b2fc8459b73d048ddfeb3c0daf4f78c3)
@@ -317,7 +317,7 @@
 			Debugger.log('Optional activity Type a.title:'+a.title+','+a.activityUIID+' added to the cm.activitiesDisplayed hashtable :'+newActivity_mc,4,'drawActivity','CanvasView');
 		}
 		else if(a.isBranchingActivity()){	
-			var newActivity_mc = activityLayer.createChildAtDepth("CanvasBranchingActivity",DepthManager.kTop,{_activity:a,_canvasController:cvc,_canvasView:cvv, setupBranchView: setupBranchView});
+			var newActivity_mc = activityLayer.createChildAtDepth("CanvasBranchingActivity",DepthManager.kTop,{_activity:a,_canvasController:cvc,_canvasView:cvv, setupBranchView: setupBranchView,  showDiagram: true});
 			cm.activitiesDisplayed.put(a.activityUIID, newActivity_mc);
 			Debugger.log('Branching activity Type a.title:'+a.title+','+a.activityUIID+' added to the cm.activitiesDisplayed hashtable :'+newActivity_mc,4,'drawActivity','CanvasView');
 	
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as
===================================================================
diff -u -rbf43d38cb2b81bd0cd46b7b78652a4109ea6984d -rc8daa528b2fc8459b73d048ddfeb3c0daf4f78c3
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as	(.../MonitorTabView.as)	(revision bf43d38cb2b81bd0cd46b7b78652a4109ea6984d)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as	(.../MonitorTabView.as)	(revision c8daa528b2fc8459b73d048ddfeb3c0daf4f78c3)
@@ -395,7 +395,7 @@
 			newActivity_mc = activityLayer.createChildAtDepth("CanvasOptionalActivity", DepthManager.kTop, {_activity:a, _children:children, _monitorController:mc, _monitorTabView:mtv, fromModuleTab:"monitorMonitorTab", learnerContainer:_learnerContainer_mc});	
 		} else if(a.isBranchingActivity()){
 			a.branchView = null;
-			newActivity_mc = activityLayer.createChildAtDepth("CanvasBranchingActivity", DepthManager.kBottom, {_activity:a,_monitorController:mc, _monitorView:mtv, _module:"monitoring", learnerContainer:_learnerContainer_mc, setupBranchView:false});
+			newActivity_mc = activityLayer.createChildAtDepth("CanvasBranchingActivity", DepthManager.kBottom, {_activity:a,_monitorController:mc, _monitorView:mtv, _module:"monitoring", learnerContainer:_learnerContainer_mc, setupBranchView:false,  showDiagram: true});
 		} else {
 			Debugger.log('The activity:'+a.title+','+a.activityUIID+' is of unknown type, it cannot be drawn',Debugger.CRITICAL,'drawActivity','MonitorTabView');
 		}
Index: lams_monitoring/web/lams_monitoring.swf
===================================================================
diff -u -rbf43d38cb2b81bd0cd46b7b78652a4109ea6984d -rc8daa528b2fc8459b73d048ddfeb3c0daf4f78c3
Binary files differ
Index: lams_monitoring/web/lams_monitoring_library.swf
===================================================================
diff -u -rbf43d38cb2b81bd0cd46b7b78652a4109ea6984d -rc8daa528b2fc8459b73d048ddfeb3c0daf4f78c3
Binary files differ