Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/tk/ToolkitController.as
===================================================================
diff -u -rc7b8f5053c4cf9d8c68d1048a4cddb61bb049cf5 -re9ff633384fada4780913483595c65db4ad2aa45
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/tk/ToolkitController.as	(.../ToolkitController.as)	(revision c7b8f5053c4cf9d8c68d1048a4cddb61bb049cf5)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/tk/ToolkitController.as	(.../ToolkitController.as)	(revision e9ff633384fada4780913483595c65db4ad2aa45)
@@ -23,6 +23,8 @@
 
 import org.lamsfoundation.lams.common.mvc.*
 import org.lamsfoundation.lams.common.util.*
+import org.lamsfoundation.lams.common.ui.*
+import org.lamsfoundation.lams.common.dict.*
 import org.lamsfoundation.lams.authoring.*
 import org.lamsfoundation.lams.authoring.cv.*
 import org.lamsfoundation.lams.authoring.tk.*
@@ -60,29 +62,37 @@
 		//lets do a test to see if we got the canvas
 		var cv:Canvas = Application.getInstance().getCanvas();
 		var canvasView:MovieClip = cv.getCanvasView().getViewMc();
-		
+		var iconMouseX = _xmouse - cv.model.getPosition().x;
+		var iconMouseY = _ymouse - cv.model.getPosition().y;
+		trace("iconMouseX: "+iconMouseX+" and iconMouseY: "+iconMouseY)
 		var optionalOnCanvas:Array  = cv.getCanvasModel().findOptionalActivities();
 		//SEE IF ITS HIT the canvas
 		var isCanvasDrop:Boolean = canvasView.hitTest(dragIcon_mc);
+		//var isOptionalDrop:Boolean;
 		Debugger.log('isCanvasDrop:'+isCanvasDrop,4,'dropIcon','TemplateActivity');
-		/*for (var i=0; i<optionalOnCanvas.length; i++){
-			trace ("testing Optional on Canvas "+i)
-			//var optionalContainer:MovieClip = 
-			if (dragIcon_mc.hitTest(optionalOnCanvas[i])){
-				
-				if (optionalOnCanvas[i].locked == true){
-					//var msg:String = "Test"   //Dictionary.getValue('act_lock_chk');
-					//LFMessage.showMessageAlert(msg);
-					trace("Container is locked")
-				}else{
-					trace("hit with optional")
-					var ta:TemplateActivity;
-					ta = _toolkitModel.getSelectedTemplateActivity();
-					cv.getCanvasModel().addParentToActivity(optionalOnCanvas[i].activity.activityUIID, ta)
-				}						
-			}
-			
-		}*/
+		for (var i=0; i<optionalOnCanvas.length; i++){
+			var optionalX:Number = optionalOnCanvas[i].activity.xCoord;
+			var optionalY:Number = optionalOnCanvas[i].activity.yCoord;
+			var optionalWidth:Number = optionalOnCanvas[i]._width
+			var optionalHeight:Number = optionalOnCanvas[i]._height
+			trace("optional xPos: "+optionalX+", optional yPos: "+optionalY+  ", width: "+optionalWidth+" and height: "+optionalHeight)
+			if (iconMouseX >= optionalX && iconMouseX <= (optionalX + optionalWidth)){
+				if (iconMouseY >= optionalY && iconMouseY <= (optionalY + optionalHeight)){
+					isCanvasDrop = false;
+					dragIcon_mc.removeMovieClip();
+					trace("optional Container is hitted")
+					if (optionalOnCanvas[i].locked){
+						var msg:String = Dictionary.getValue('act_lock_chk');
+						LFMessage.showMessageAlert(msg);
+					}else{
+						trace("hit with optional")
+						var ta:TemplateActivity;
+						ta = _toolkitModel.getSelectedTemplateActivity();
+						cv.setDroppedTemplateActivity(ta, optionalOnCanvas[i].activity.activityUIID);
+					}
+				}					
+			}			
+		}
 		if(isCanvasDrop){
 
 			//remove the drag icon
@@ -93,17 +103,5 @@
 			Debugger.log('ta:'+ta.toolActivity.title,4,'canvasDrop','ToolkitController');		
 			cv.setDroppedTemplateActivity(ta);
 		}
-		
-		
-		
-	
-	
-	
-	
 	}
-	
-	
-	
-	
-       
 }