Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as
===================================================================
diff -u -rc7cb4169bd37a4670f48f8d1452eecb8837e94ac -re29da944eda8130524f2badd0f3649056f6835be
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as	(.../PropertyInspector.as)	(revision c7cb4169bd37a4670f48f8d1452eecb8837e94ac)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as	(.../PropertyInspector.as)	(revision e29da944eda8130524f2badd0f3649056f6835be)
@@ -20,6 +20,7 @@
 	
 	private var _canvasModel:CanvasModel;
 	private var _canvasController:CanvasController;
+	private var _dictionary:Dictionary;
 	 //References to components + clips 
     private var _container:MovieClip;       //The container window that holds the dialog. Will contain any init params that were passed into createPopUp
    
@@ -63,8 +64,13 @@
 	private var rndGroup_radio:RadioButtonGroup;
 	private var numGroups_stp:NumericStepper;
 	private var numLearners_stp:NumericStepper;
-
 	
+	//Complex Activity
+	private var min_lbl:Label;
+	private var max_lbl:Label;
+	private var min_act:ComboBox;
+	private var max_act:ComboBox;
+	
 	//screen assets:
 	private var body_pnl:Panel;
 	private var bar_pnl:Panel;
@@ -88,6 +94,8 @@
 		//let it wait one frame to set up the components.
 		MovieClipUtils.doLater(Proxy.create(this,init));
 		
+		//_dictionary = Dictionary.getInstance();
+		//_dictionary.addEventListener('init',Proxy.create(this,setupLabels));
 	}
 	
 	public function init():Void{
@@ -213,8 +221,22 @@
 				//show the title
 				title_txt.text = StringUtils.cleanNull(a.title);
 			
+			}else if(a.isOptionalActivity()){
+				//its an optional activity
+				showOptionalControls(true);
+				showGroupingControls(false);
+				//showRelevantGroupOptions();
+				showToolActivityControls(false);
+				showGateControls(false);
+				showAppliedGroupingControls(true);
+				populateGroupingProperties(GroupingActivity(a));
+				showAppliedGroupingProperties(a);
+				//show the title
+				title_txt.text = StringUtils.cleanNull(a.title);
+			
 			}else{
 				//its a tool activity
+				showOptionalControls(false);
 				showGroupingControls(false);
 				showToolActivityControls(true);
 				showGateControls(false);
@@ -242,6 +264,7 @@
 			showGroupingControls(false);
 			showToolActivityControls(false);
 			showGateControls(false);
+			showOptionalControls(false);
 		}
 	}
 	
@@ -258,7 +281,7 @@
 					
 		currentGrouping_lbl.text = "GroupingUIID:"+StringUtils.cleanNull(ta.runOffline.groupingUIID);
 			
-		
+
 	}
 	
 	private function showGateActivityProperties(ga:GateActivity){
@@ -352,6 +375,15 @@
 		editGrouping_btn.visible = v;
 	}
 	
+	private function showOptionalControls(v:Boolean){
+
+		min_lbl.visible = v		
+		max_lbl.visible = v;
+		min_act.visible = v;
+		max_act.visible = v;
+		
+	}
+	
 	private function showGateControls(v:Boolean){
 		trace('showGateControls....'+v);
 		hours_lbl.visible = v;