Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as
===================================================================
diff -u -r0ef5d3d288ff5913c2627b25709f3725ea159cb1 -red8d03c7137f17872aa9efe632990f094ac28bd8
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as	(.../CanvasActivity.as)	(revision 0ef5d3d288ff5913c2627b25709f3725ea159cb1)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as	(.../CanvasActivity.as)	(revision ed8d03c7137f17872aa9efe632990f094ac28bd8)
@@ -3,6 +3,7 @@
 import org.lamsfoundation.lams.common.util.ui.*;
 import org.lamsfoundation.lams.authoring.*;
 import org.lamsfoundation.lams.authoring.cv.*;
+import org.lamsfoundation.lams.common.style.*
 import com.polymercode.Draw;
 
 
@@ -14,23 +15,29 @@
   
 	public static var TOOL_ACTIVITY_WIDTH:Number = 123.1;
 	public static var TOOL_ACTIVITY_HEIGHT:Number = 50.5;
-	public static var GATE_ACTIVITY_HEIGHT:Number = 30;
-	public static var GATE_ACTIVITY_WIDTH:Number = 30;
+	public static var GATE_ACTIVITY_HEIGHT:Number =50;
+	public static var GATE_ACTIVITY_WIDTH:Number = 50;
+	public static var ICON_WIDTH:Number = 30;
+	public static var ICON_HEIGHT:Number = 30;
 	
 	//this is set by the init object
 	private var _canvasController:CanvasController;
 	private var _canvasView:CanvasView;
+	private var _tm:ThemeManager;
 	//TODO:This should be ToolActivity
 	private var _activity:Activity;
 	
+	private var _isSelected:Boolean;
+	
 	//locals
 	private var icon_mc:MovieClip;
 	private var icon_mcl:MovieClipLoader;
 	private var title_lbl:MovieClip;
 	private var groupIcon_mc:MovieClip;
 	private var stopSign_mc:MovieClip;	
 	private var clickTarget_mc:MovieClip;
-	private var canvasActivity_mc:MovieClip;
+	private var canvasActivity_mc:MovieClip;
+	private var canvasActivityGrouped_mc:MovieClip;
 	private var _dcStartTime:Number = 0;
 	private var _doubleClicking:Boolean;
 	private var _visibleWidth:Number;
@@ -42,6 +49,7 @@
 	
 	function CanvasActivity(){
 		//Debugger.log("_activity:"+_activity.title,4,'Constructor','CanvasActivity');
+		_tm = ThemeManager.getInstance();
 		//let it wait one frame to set up the components.
 		//this has to be set b4 the do later :)
 		if(_activity.isGateActivity()){
@@ -78,7 +86,7 @@
 		if(!_activity.isGateActivity() && !_activity.isGroupActivity()){
 			loadIcon();
 		}
-		
+		setStyles();
 		MovieClipUtils.doLater(Proxy.create(this,draw));
 
 	}
@@ -90,6 +98,7 @@
 		stopSign_mc._visible = isVisible;
 		canvasActivity_mc._visible = isVisible;
 		clickTarget_mc._visible = isVisible;
+		canvasActivityGrouped_mc._visible = isVisible;
 	}
 	
 	/**
@@ -99,6 +108,7 @@
 	 */
 	public function refresh():Void{
 		draw();
+		setSelected(_isSelected);
 	}
 	
 	public function setSelected(isSelected){
@@ -109,10 +119,12 @@
 			var tgt_mc;
 			if(_activity.isGateActivity()){
 				tgt_mc = stopSign_mc;			
+			}else if(_activity.groupingUIID > 0){
+				tgt_mc = canvasActivityGrouped_mc;
 			}else{
 				tgt_mc = canvasActivity_mc;
 			}
-			
+			Debugger.log("tgt_mc:"+tgt_mc,4,'setSelected','CanvasActivity');
 				//vars
 				var tl_x = tgt_mc._x - MARGIN; 							//top left x
 				var tl_y = tgt_mc._y - MARGIN;							//top left y
@@ -125,6 +137,9 @@
 				
 				
 				//dashTo(target:MovieClip, x1:Number, y1:Number,x2:Number, y2:Number, dashLength:Number, spaceLength:Number )
+				if(_selected_mc){
+					_selected_mc.removeMovieClip();
+				}
 				_selected_mc = _base_mc.createEmptyMovieClip('_selected_mc',_base_mc.getNextHighestDepth());
 				Draw.dashTo(_selected_mc,tl_x,tl_y,tr_x,tr_y,2,3,2,0x266DEE);
 				Draw.dashTo(_selected_mc,tr_x,tr_y,br_x,br_y,2,3,2,0x266DEE);
@@ -136,9 +151,10 @@
 				Draw.dashTo(_base_mc,br_x,br_y,bl_x,bl_y,2,3,2,0x266DEE);
 				Draw.dashTo(_base_mc,bl_x,bl_y,tl_x,tl_y,2,3,2,0x266DEE);
 				*/
+				
+				_isSelected = isSelected;
 			
 			
-			
 		}else{
 			//hide the selected border
 			_selected_mc.removeMovieClip();
@@ -176,9 +192,9 @@
 		Debugger.log(_activity.title+',_activity.isGateActivity():'+_activity.isGateActivity(),4,'draw','CanvasActivity');
 		
 		
-		
+		var theIcon_mc:MovieClip;
 		title_lbl._visible = true;
-		icon_mc._visible = true;
+		
 		clickTarget_mc._visible = true;
 		
 		if(_activity.isGateActivity()){
@@ -187,14 +203,38 @@
 			title_lbl.visible=false;
 			clickTarget_mc._width = GATE_ACTIVITY_WIDTH;
 			clickTarget_mc._height= GATE_ACTIVITY_HEIGHT;
+			stopSign_mc._height= GATE_ACTIVITY_HEIGHT;
+			stopSign_mc._width= GATE_ACTIVITY_WIDTH;
+			stopSign_mc._x = 0;
+			stopSign_mc._y = 0;
 			
+			
+			
 		}else{
+			//chose the icon:
 			if(_activity.isGroupActivity()){
 				groupIcon_mc._visible = true;
+				icon_mc._visible = false;
+				theIcon_mc = groupIcon_mc;
 			}else{
 				groupIcon_mc._visible = false;
+				icon_mc._visible = true;
+				theIcon_mc = icon_mc;
 			}
-			canvasActivity_mc._visible=true;
+			theIcon_mc._width = ICON_WIDTH;
+			theIcon_mc._height = ICON_HEIGHT;
+			
+			
+			
+			//chose the background mc
+			if(_activity.groupingUIID > 0){
+				canvasActivityGrouped_mc._visible = true;
+				canvasActivity_mc._visible=false;
+			}else{
+				canvasActivity_mc._visible=true;
+				canvasActivityGrouped_mc._visible = false;
+			}
+			
 			title_lbl.visible=true;
 			//clickTarget_mc._visible=true;
 			stopSign_mc._visible = false;
@@ -207,10 +247,7 @@
 			
 		}
 	
-		
-	
-		//indicate grouping
-		
+
 		//position
 		_x = _activity.xCoord;
 		_y = _activity.yCoord;
@@ -331,6 +368,25 @@
 	public function setActivity(a:Activity){
 		_activity = a;
 	}
+
+
+	/**
+	 * Get the CSSStyleDeclaration objects for each component and applies them
+	 * directly to the instanced
+	 * @usage   
+	 * @return  
+	 */
+	private function setStyles() {
+		var styleObj = _tm.getStyleObject('label');
+		
+		title_lbl.setStyle('styleName',styleObj);
+		title_lbl.setStyle('textAlign', 'center');
+		//title_lbl.setStyle('textAlign','center');
+		
+		
+		
+		
+    }
+    
 
-
 }
\ No newline at end of file