Index: lams_flex/LamsAuthor/ActivityComponent.as
===================================================================
diff -u
--- lams_flex/LamsAuthor/ActivityComponent.as	(revision 0)
+++ lams_flex/LamsAuthor/ActivityComponent.as	(revision 3fb93ca162c53177b3ddfdf836c47bf868e144ff)
@@ -0,0 +1,188 @@
+package org.lamsfoundation.lams.author.components.activity
+{
+	import flash.events.Event;
+	import flash.events.MouseEvent;
+	import flash.geom.Point;
+	
+	import mx.containers.VBox;
+	import mx.controls.Label;
+	import mx.core.Application;
+	import mx.core.DragSource;
+	import mx.managers.DragManager;
+	
+	import org.lamsfoundation.lams.author.components.transition.Transition;
+	import org.lamsfoundation.lams.author.events.TransitionEvent;
+	import org.lamsfoundation.lams.author.util.Constants;
+	
+	public class ActivityComponent extends VBox
+	{
+		public var xpos:int;
+		public var ypos:int;
+		public var title:Label;
+		
+		public var centerX:int;
+		public var centerY:int;
+		
+		private var transitionIn:Transition;
+		private var transitionOut:Transition;
+		
+		// The mouseMove event handler for the Image control
+	    // initiates the drag-and-drop operation.
+	    public function mouseMoveHandler(event:MouseEvent):void 
+	    {                
+	        switch (Application.application.cursorState) {
+	        	case Constants.CURSOR_STATE_NORMAL:
+	        		var activityComponent:ActivityComponent = event.currentTarget as ActivityComponent;
+			        var ds:DragSource = new DragSource();
+			        ds.addData(activityComponent, "img");               
+			        DragManager.doDrag(activityComponent, ds, event);
+			        setCenter();
+			   		
+			   		if (transitionOut != null)
+			   		{
+			   			transitionOut.startX = centerX;
+			   			transitionOut.startY = centerY;
+			   			transitionOut.invalidateDisplayList();
+			   		} 
+			   		
+			   		
+			   		if (transitionIn != null) {
+			   			transitionIn.endX = centerX;
+			   			transitionIn.endY = centerY;
+			   			transitionIn.invalidateDisplayList();
+			   		}
+			   		
+			        break;
+	        }
+	    }
+	    
+	    public function load():void {
+	    	
+	    }
+	    
+	    
+	    public function mouseDown(event:MouseEvent):void {
+	    	
+	    	switch (Application.application.cursorState) {
+	    		case Constants.CURSOR_STATE_TRANSITION:
+	    		var transitionEvent:TransitionEvent = new TransitionEvent(TransitionEvent.TRANSITION_EVENT);
+	    		transitionEvent.sourceAcivityComponent = this;
+	    		transitionEvent.localX = event.localX;
+	    		transitionEvent.localY = event.localY;
+	    		//Application.application.dispatchEvent(transitionEvent);
+	    		startDragging(transitionEvent)
+	    		break;	
+	    	}
+	    	
+	    }
+	    
+	    public function setCenter():void {
+	    	centerX = x + height/2;
+			centerY = y + height/2 -10;
+	    }
+	    
+	    
+	    
+        private function startDragging(event:TransitionEvent):void {
+		 
+			if (transitionOut != null) {
+				parent.removeChild(transitionOut);
+			}
+			
+			setCenter();
+			Application.application.uiState = Constants.UI_STATE_DRAWING;
+			transitionOut = new Transition();
+			transitionOut.startX = event.sourceAcivityComponent.centerX;
+			transitionOut.startY = event.sourceAcivityComponent.centerY;
+			transitionOut.endX = event.sourceAcivityComponent.centerX;
+			transitionOut.endY = event.sourceAcivityComponent.centerY;
+			transitionOut.invalidateProperties();
+			
+			parent.addChild(transitionOut);
+			
+			systemManager.addEventListener(MouseEvent.MOUSE_MOVE, systemManager_mouseMoveHandler, true);
+			systemManager.addEventListener(MouseEvent.MOUSE_UP, systemManager_mouseUpHandler, true);
+			systemManager.stage.addEventListener(Event.MOUSE_LEAVE, stage_mouseLeaveHandler);
+		
+		}
+		
+		protected function stopDragging():void
+		{
+		    Application.application.uiState = Constants.UI_STATE_NORMAL;
+		    systemManager.removeEventListener(MouseEvent.MOUSE_MOVE, systemManager_mouseMoveHandler, true);			
+		    systemManager.removeEventListener(MouseEvent.MOUSE_UP, systemManager_mouseUpHandler, true);
+		    systemManager.stage.removeEventListener(Event.MOUSE_LEAVE, stage_mouseLeaveHandler);
+		}
+		
+		private function systemManager_mouseMoveHandler(event:MouseEvent):void
+	    {
+	    	var pt:Point = new Point(event.stageX,event.stageY);
+	    	pt = parent.globalToLocal(pt);
+	    	
+	    	transitionOut.endX = pt.x;
+	    	transitionOut.endY = pt.y;
+	    	
+	    	transitionOut.invalidateDisplayList();
+	    }
+	    
+	    private function systemManager_mouseUpHandler(event:MouseEvent):void
+	    {
+	    	stopDragging();
+	    	
+	    	var validTransition:Boolean = false;
+	    	for (var i:int = 0; i < parent.numChildren; i++) {
+	    		
+	    		if (parent.getChildAt(i) is ActivityComponent) {
+	    			var activityComponent:ActivityComponent = parent.getChildAt(i) as ActivityComponent;
+	    			
+	    			var boundPoint:Point = activityComponent.contentToGlobal(new Point(activityComponent.x,activityComponent.y));
+	    			var eventPoint:Point = contentToGlobal(new Point(event.stageX,event.stageY));
+	    			
+	    			
+	    			var maxx:int = boundPoint.x + activityComponent.width;
+	    			var maxy:int = boundPoint.y + activityComponent.height;	    			
+
+	    			if (eventPoint.x > boundPoint.x && 
+	    					eventPoint.x < maxx &&
+	    					eventPoint.y > boundPoint.y &&
+	    					eventPoint.y < maxy) {
+	    				// We are within the bounds of an activity
+	    						
+	    				activityComponent.transitionIn = transitionOut;	
+	    				validTransition = true;		
+	    			}
+	    		}
+	    	}
+	    	
+	    	if (!validTransition) {
+	    		parent.removeChild(transitionOut);
+	    		transitionOut = null;
+	    	}
+	    	
+	    }
+	    
+	    private function stage_mouseLeaveHandler(event:MouseEvent):void
+	    {
+	    	stopDragging();
+	    }
+	    
+	    
+	    
+	    
+	    
+	    
+	    
+	    
+	    
+	    
+	    
+	    
+	    
+	    
+	    
+	    
+
+	}
+	
+	
+}
\ No newline at end of file
Index: lams_flex/LamsAuthor/src/LamsAuthor.mxml
===================================================================
diff -u -re11155f5e0c1a923e08fcd2ce2f57873bc1c6904 -r3fb93ca162c53177b3ddfdf836c47bf868e144ff
--- lams_flex/LamsAuthor/src/LamsAuthor.mxml	(.../LamsAuthor.mxml)	(revision e11155f5e0c1a923e08fcd2ce2f57873bc1c6904)
+++ lams_flex/LamsAuthor/src/LamsAuthor.mxml	(.../LamsAuthor.mxml)	(revision 3fb93ca162c53177b3ddfdf836c47bf868e144ff)
@@ -30,6 +30,10 @@
 			// State of cursor transition/help/dataflow etc...
 			public var cursorState:int = Constants.CURSOR_STATE_NORMAL;
 			
+			// ui state
+			public var uiState:int = Constants.UI_STATE_NORMAL;
+			
+			
 			private function preInit():void {
 				
 				if (TESTING && !TESTING_LOCAL) {
Index: lams_flex/LamsAuthor/src/assets/css/learningLibrary.css
===================================================================
diff -u -rd8dfc7bb7a4c77a846cfcd2cb0bc71d500df0af3 -r3fb93ca162c53177b3ddfdf836c47bf868e144ff
--- lams_flex/LamsAuthor/src/assets/css/learningLibrary.css	(.../learningLibrary.css)	(revision d8dfc7bb7a4c77a846cfcd2cb0bc71d500df0af3)
+++ lams_flex/LamsAuthor/src/assets/css/learningLibrary.css	(.../learningLibrary.css)	(revision 3fb93ca162c53177b3ddfdf836c47bf868e144ff)
@@ -1,66 +1,75 @@
-/* CSS file */
-
-.linkButtonWindowShade {
-  	headerClass:ClassReference('mx.controls.LinkButton');
-  	header-style-name: linkButtonStyle;
- 	drop-shadow-enabled:true;
-  	corner-radius:10;
-  	border-style:solid;
-  	font-weight:bold;
-   	use-roll-over: false;
-}
-
-.linkButtonStyle {
-	corner-radius:10;	
-	fill-alphas:1,1;
-	padding-left:10;
-	
-}
-
-.informative {
-  	headerClass:ClassReference('mx.controls.LinkButton');
-  	header-style-name: linkButtonStyle;
- 	drop-shadow-enabled:true;
-  	corner-radius:10;
-  	border-style:solid;
-  	font-weight:bold;
-   	use-roll-over: false;
-   	roll-over-color:#FFEEC8;
-   	selectionColor:#FFEEC8;
-
-}
-
-.reflective {
-  	headerClass:ClassReference('mx.controls.LinkButton');
-  	header-style-name: linkButtonStyle;
- 	drop-shadow-enabled:true;
-  	corner-radius:10;
-  	border-style:solid;
-  	font-weight:bold;
-   	use-roll-over: false;
-   	roll-over-color:#DDFCB1;
-   	selectionColor:#DDFCB1;
-}
-
-.collaborative {
-  	headerClass:ClassReference('mx.controls.LinkButton');
-  	header-style-name: linkButtonStyle;
- 	drop-shadow-enabled:true;
-  	corner-radius:10;
-  	border-style:solid;
-  	font-weight:bold;
-   	use-roll-over: false;
-   	roll-over-color:#FFFDBE;
-   	selectionColor:#FFFDBE;
-}
-
-.assessment {
-  	headerClass:ClassReference('mx.controls.LinkButton');
-  	header-style-name: linkButtonStyle;
- 	drop-shadow-enabled:true;
-  	corner-radius:10;
-  	border-style:solid;
-  	font-weight:bold;
-   	roll-over-color:#E9E2F5;
-   	selectionColor:#E9E2F5;    	
+/* CSS file */
+
+.linkButtonWindowShade {
+  	headerClass:ClassReference('mx.controls.LinkButton');
+  	header-style-name: linkButtonStyle;
+ 	drop-shadow-enabled:true;
+  	corner-radius:10;
+  	border-style:solid;
+  	font-weight:bold;
+   	use-roll-over: false;
+}
+
+.linkButtonStyle {
+	corner-radius:10;	
+	fill-alphas:1,1;
+	padding-left:10;
+	
+}
+
+.all {
+  	headerClass:ClassReference('mx.controls.LinkButton');
+  	header-style-name: linkButtonStyle;
+ 	drop-shadow-enabled:true;
+  	corner-radius:10;
+  	border-style:solid;
+  	font-weight:bold;
+}
+
+.informative {
+  	headerClass:ClassReference('mx.controls.LinkButton');
+  	header-style-name: linkButtonStyle;
+ 	drop-shadow-enabled:true;
+  	corner-radius:10;
+  	border-style:solid;
+  	font-weight:bold;
+   	use-roll-over: false;
+   	roll-over-color:#FFEEC8;
+   	selectionColor:#FFEEC8;
+
+}
+
+.reflective {
+  	headerClass:ClassReference('mx.controls.LinkButton');
+  	header-style-name: linkButtonStyle;
+ 	drop-shadow-enabled:true;
+  	corner-radius:10;
+  	border-style:solid;
+  	font-weight:bold;
+   	use-roll-over: false;
+   	roll-over-color:#DDFCB1;
+   	selectionColor:#DDFCB1;
+}
+
+.collaborative {
+  	headerClass:ClassReference('mx.controls.LinkButton');
+  	header-style-name: linkButtonStyle;
+ 	drop-shadow-enabled:true;
+  	corner-radius:10;
+  	border-style:solid;
+  	font-weight:bold;
+   	use-roll-over: false;
+   	roll-over-color:#FFFDBE;
+   	selectionColor:#FFFDBE;
+}
+
+.assessment {
+  	headerClass:ClassReference('mx.controls.LinkButton');
+  	header-style-name: linkButtonStyle;
+ 	drop-shadow-enabled:true;
+  	corner-radius:10;
+  	border-style:solid;
+  	font-weight:bold;
+   	roll-over-color:#E9E2F5;
+   	selectionColor:#E9E2F5;    	
 }
\ No newline at end of file
Index: lams_flex/LamsAuthor/src/assets/images/icon_minimize.gif
===================================================================
diff -u
Binary files differ
Index: lams_flex/LamsAuthor/src/assets/images/portlet_minimize_icon_off.gif
===================================================================
diff -u
Binary files differ
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasArea.mxml
===================================================================
diff -u -re11155f5e0c1a923e08fcd2ce2f57873bc1c6904 -r3fb93ca162c53177b3ddfdf836c47bf868e144ff
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasArea.mxml	(.../CanvasArea.mxml)	(revision e11155f5e0c1a923e08fcd2ce2f57873bc1c6904)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasArea.mxml	(.../CanvasArea.mxml)	(revision 3fb93ca162c53177b3ddfdf836c47bf868e144ff)
@@ -6,7 +6,6 @@
 	
 	<mx:Script>
 		<![CDATA[
-			import org.lamsfoundation.lams.author.components.transition.Transition;
 			import mx.controls.Label;
 			import mx.controls.Image;
 			import mx.core.Container;
@@ -17,6 +16,7 @@
             import flash.events.MouseEvent;
             import mx.collections.ArrayCollection;
             import org.lamsfoundation.lams.author.components.activity.*;
+            import mx.effects.Resize;
             
             
             [Bindable]
@@ -103,6 +103,15 @@
                 	}
                 }                    
             }
+            
+             private function maximizeLearningLibrary():void {
+	        	var effResize:Resize = new Resize();
+	        	effResize.stop();
+	            effResize.heightFrom = 0;
+	            effResize.heightTo = 120;
+	            effResize.duration = 100;
+	            effResize.play([compLearningLibrary2]);
+	        }
 		]]>
 	</mx:Script>
 	
@@ -117,18 +126,17 @@
 	</mx:HBox>
 	<!--<mx:HSlider id="zoomSlider" minimum="0.8" value="1.5"
 			maximum="3" change="applyZoom()" width="150"/>-->
-	<mx:Canvas height="100%" width="100%" >
-		
+	<mx:Canvas height="100%" width="100%" verticalScrollPolicy="off" horizontalScrollPolicy="off" >
 				<!-- The Canvas is the drag target --> 
 			    <components:CanvasBox id="canvasBox" 
 			        width="100%" height="100%"   
 			     >
-			        	
-			    </components:CanvasBox>
+			     </components:CanvasBox>
+			    
+				<mx:Button horizontalCenter="0" bottom="0" click="maximizeLearningLibrary()" label="^"></mx:Button>
 			    <components:LearningLibrary2 id="compLearningLibrary2"
 						height="120"  horizontalCenter="0" bottom="0"
 						width="900"
-					/>
+				/>
 	</mx:Canvas>
-	
 </mx:HBox>
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasBox.mxml
===================================================================
diff -u -re11155f5e0c1a923e08fcd2ce2f57873bc1c6904 -r3fb93ca162c53177b3ddfdf836c47bf868e144ff
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasBox.mxml	(.../CanvasBox.mxml)	(revision e11155f5e0c1a923e08fcd2ce2f57873bc1c6904)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasBox.mxml	(.../CanvasBox.mxml)	(revision 3fb93ca162c53177b3ddfdf836c47bf868e144ff)
@@ -9,7 +9,6 @@
 	<mx:Script>
 		<![CDATA[
 			import mx.controls.Alert;
-			import org.lamsfoundation.lams.author.components.transition.Transition;
 			import mx.core.UIComponent;
 			import org.lamsfoundation.lams.author.components.activity.*;
 			import org.lamsfoundation.lams.author.events.TransitionEvent;
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/LearningLibrary.mxml
===================================================================
diff -u -rd8dfc7bb7a4c77a846cfcd2cb0bc71d500df0af3 -r3fb93ca162c53177b3ddfdf836c47bf868e144ff
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/LearningLibrary.mxml	(.../LearningLibrary.mxml)	(revision d8dfc7bb7a4c77a846cfcd2cb0bc71d500df0af3)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/LearningLibrary.mxml	(.../LearningLibrary.mxml)	(revision 3fb93ca162c53177b3ddfdf836c47bf868e144ff)
@@ -1,72 +1,80 @@
-<?xml version="1.0" encoding="utf-8"?>
-<mx:VBox xmlns:mx="http://www.adobe.com/2006/mxml" 
-	backgroundColor="#C2D5FE" 
-	xmlns:flexlib="http://code.google.com/p/flexlib/"
-	paddingTop="10" paddingLeft="5" paddingRight="5" paddingBottom="10"
-	
-	>
-
-	<mx:Style source="assets/css/learningLibrary.css" />
-	
-	<mx:Script>
-		<![CDATA[
-			import mx.core.Application;
-			import mx.controls.Label;
-			import mx.containers.HBox;
-			import mx.core.DragSource;
-			import mx.binding.utils.BindingUtils;
-			import mx.core.MovieClipAsset;
-			import mx.events.DragEvent;
-			import org.lamsfoundation.lams.author.model.learninglibrary.LearningLibraryEntry;
-			import mx.controls.Image;
-			import mx.collections.ArrayCollection;
-			import org.lamsfoundation.lams.author.util.Constants;
-			import mx.managers.DragManager;
-			import org.lamsfoundation.lams.author.components.activity.LearningLibraryEntryComponent;
-				
-			[Bindable] 
-			public var learningLibraryTree:ArrayCollection;
-			
-          	public function loadLearningLibrary():void {
-   				
-   				
-   				for each(var learningLibraryEntry:LearningLibraryEntry in Application.application.learningLibrary) {
-   					var llcomp:LearningLibraryEntryComponent = new LearningLibraryEntryComponent();
-		   			llcomp.load(learningLibraryEntry);
-   					switch (learningLibraryEntry.category) {
-   						case Constants.TOOL_CATEGORY_ASSESSMENT:
-		   					wsAssessment.addChild(llcomp);
-   							break;
-   						case Constants.TOOL_CATEGORY_INFORMATIVE:
-		   					wsInformative.addChild(llcomp);
-   							break;
-   						case Constants.TOOL_CATEGORY_REFLECTIVE:
-		   					wsReflective.addChild(llcomp);
-   							break;
-   						case Constants.TOOL_CATEGORY_COLLABORATIVE:
-   							wsCollaborative.addChild(llcomp);
-   							break;
-   					}
-   				}
-   			}
-		]]>
-	</mx:Script>
-	
-
-	<flexlib:WindowShade id="wsInformative" tabChildren="{wsInformative.opened}" styleName="informative" opened="false"
-      	label="Informative" width="100%" paddingLeft="20" paddingBottom="20" backgroundColor="#FFEEC8"  shadowDirection="right">	
-    </flexlib:WindowShade>
-     
-    <flexlib:WindowShade id="wsReflective" tabChildren="{wsReflective.opened}" styleName="reflective" opened="false"
-      	label="Reflective" width="100%" paddingLeft="20" paddingBottom="20" backgroundColor="#DDFCB1" shadowDirection="right" >
-    </flexlib:WindowShade>
-    
-    <flexlib:WindowShade id="wsCollaborative" tabChildren="{wsCollaborative.opened}" styleName="collaborative" opened="false"
-      	label="Collaborative" width="100%" paddingLeft="20" paddingBottom="20" backgroundColor="#FFFDBE" shadowDirection="right" >
-    </flexlib:WindowShade>
-    
-    <flexlib:WindowShade id="wsAssessment" tabChildren="{wsAssessment.opened}" styleName="assessment" opened="false"
-      	label="Asessment" width="100%" paddingLeft="20" paddingBottom="20" backgroundColor="#E9E2F5" shadowDirection="right" > 
-    </flexlib:WindowShade>
-    
-</mx:VBox>
+<?xml version="1.0" encoding="utf-8"?>
+<mx:VBox xmlns:mx="http://www.adobe.com/2006/mxml" 
+	backgroundColor="#C2D5FE" 
+	xmlns:flexlib="http://code.google.com/p/flexlib/"
+	paddingTop="10" paddingLeft="5" paddingRight="5" paddingBottom="10"
+	
+	>
+
+	<mx:Style source="assets/css/learningLibrary.css" />
+	
+	<mx:Script>
+		<![CDATA[
+			import mx.core.Application;
+			import mx.controls.Label;
+			import mx.containers.HBox;
+			import mx.core.DragSource;
+			import mx.binding.utils.BindingUtils;
+			import mx.core.MovieClipAsset;
+			import mx.events.DragEvent;
+			import org.lamsfoundation.lams.author.model.learninglibrary.LearningLibraryEntry;
+			import mx.controls.Image;
+			import mx.collections.ArrayCollection;
+			import org.lamsfoundation.lams.author.util.Constants;
+			import mx.managers.DragManager;
+			import org.lamsfoundation.lams.author.components.LearningLibraryEntryComponent;
+				
+			[Bindable] 
+			public var learningLibraryTree:ArrayCollection;
+			
+          	public function loadLearningLibrary():void {
+   				
+   				
+   				for each(var learningLibraryEntry:LearningLibraryEntry in Application.application.learningLibrary) {
+   					var llcomp:LearningLibraryEntryComponent = new LearningLibraryEntryComponent();
+		   			llcomp.load(learningLibraryEntry);
+		   			
+		   			var llcomp2:LearningLibraryEntryComponent = new LearningLibraryEntryComponent();
+		   			llcomp2.load(learningLibraryEntry);
+					wsAll.addChild(llcomp2);
+		   			
+   					switch (learningLibraryEntry.category) {
+   						case Constants.TOOL_CATEGORY_ASSESSMENT:
+		   					wsAssessment.addChild(llcomp);
+   							break;
+   						case Constants.TOOL_CATEGORY_INFORMATIVE:
+		   					wsInformative.addChild(llcomp);
+   							break;
+   						case Constants.TOOL_CATEGORY_REFLECTIVE:
+		   					wsReflective.addChild(llcomp);
+   							break;
+   						case Constants.TOOL_CATEGORY_COLLABORATIVE:
+   							wsCollaborative.addChild(llcomp);
+   							break;
+   					}
+   				}
+   			}
+		]]>
+	</mx:Script>
+	
+	<flexlib:WindowShade id="wsAll" tabChildren="{wsInformative.opened}" styleName="all" opened="false"
+      	label="All" width="100%" paddingLeft="20" paddingBottom="20"  shadowDirection="right">	
+    </flexlib:WindowShade>
+
+	<flexlib:WindowShade id="wsInformative" tabChildren="{wsInformative.opened}" styleName="informative" opened="false"
+      	label="Informative" width="100%" paddingLeft="20" paddingBottom="20" backgroundColor="#FFEEC8"  shadowDirection="right">	
+    </flexlib:WindowShade>
+     
+    <flexlib:WindowShade id="wsReflective" tabChildren="{wsReflective.opened}" styleName="reflective" opened="false"
+      	label="Reflective" width="100%" paddingLeft="20" paddingBottom="20" backgroundColor="#DDFCB1" shadowDirection="right" >
+    </flexlib:WindowShade>
+    
+    <flexlib:WindowShade id="wsCollaborative" tabChildren="{wsCollaborative.opened}" styleName="collaborative" opened="false"
+      	label="Collaborative" width="100%" paddingLeft="20" paddingBottom="20" backgroundColor="#FFFDBE" shadowDirection="right" >
+    </flexlib:WindowShade>
+    
+    <flexlib:WindowShade id="wsAssessment" tabChildren="{wsAssessment.opened}" styleName="assessment" opened="false"
+      	label="Asessment" width="100%" paddingLeft="20" paddingBottom="20" backgroundColor="#E9E2F5" shadowDirection="right" > 
+    </flexlib:WindowShade>
+    
+</mx:VBox>
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/LearningLibrary2.mxml
===================================================================
diff -u -re11155f5e0c1a923e08fcd2ce2f57873bc1c6904 -r3fb93ca162c53177b3ddfdf836c47bf868e144ff
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/LearningLibrary2.mxml	(.../LearningLibrary2.mxml)	(revision e11155f5e0c1a923e08fcd2ce2f57873bc1c6904)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/LearningLibrary2.mxml	(.../LearningLibrary2.mxml)	(revision 3fb93ca162c53177b3ddfdf836c47bf868e144ff)
@@ -14,12 +14,14 @@
 	
 	<mx:Script>
 		<![CDATA[
+			import mx.effects.Move;
+			import mx.effects.Resize;
 			import mx.core.Application;
 			import org.lamsfoundation.lams.author.model.learninglibrary.LearningLibraryEntry;
 			import org.lamsfoundation.lams.author.util.Constants;
-			import org.lamsfoundation.lams.author.components.activity.LearningLibraryEntryComponent2;
+			import org.lamsfoundation.lams.author.components.LearningLibraryEntryComponent2;
 			import mx.events.ItemClickEvent;
-			import mx.controls.tabBarClasses.Tab;
+			import mx.controls.tabBarClasses.Tab;	
 			import mx.managers.CursorManager;
 		
           	public function loadLearningLibrary():void {
@@ -78,7 +80,16 @@
 	 
 	        }
 	        
-	        private function changeCursorState(e:MouseEvent, state:int):void{
+	        private function minimize():void {
+	        	var effResize:Resize = new Resize();
+	        	effResize.stop();
+	            effResize.heightFrom = height;
+	            effResize.heightTo = 0;
+	            effResize.duration = 100;
+	            effResize.play([this]); 
+	        }
+
+			private function changeCursorState(e:MouseEvent, state:int):void{
 				Application.application.cursorState = state;
 			}
 
@@ -125,5 +136,9 @@
 		<mx:Button label="Transition" click="changeCursorState(event, Constants.CURSOR_STATE_TRANSITION)"></mx:Button>
 		<mx:Button label="Data Flow"></mx:Button>
 	</mx:VBox>
+	
+	<mx:Button width="10" height="10" icon="@Embed(source='assets/images/portlet_minimize_icon_off.gif')" bottom="10" click="minimize()">
+	
+	</mx:Button>
 
 </mx:HBox>
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/LearningLibraryEntryComponent.mxml
===================================================================
diff -u
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/LearningLibraryEntryComponent.mxml	(revision 0)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/LearningLibraryEntryComponent.mxml	(revision 3fb93ca162c53177b3ddfdf836c47bf868e144ff)
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<mx:HBox xmlns:mx="http://www.adobe.com/2006/mxml" width="100%" height="30" verticalAlign="middle">
+	
+	<mx:Script>
+		<![CDATA[
+			import org.lamsfoundation.lams.author.model.learninglibrary.LearningLibraryEntry;
+			import org.lamsfoundation.lams.author.components.activity.*;
+			
+			import mx.controls.Image;
+			import mx.controls.Label;
+			import mx.core.DragSource;
+			import mx.managers.DragManager;
+			import mx.core.UIComponent;
+			
+			public var iconImage:Image;
+			public var title:Label;
+			public var learningLibraryEntry:LearningLibraryEntry;
+					
+			public function load(learningLibraryEntry:LearningLibraryEntry):void {
+				this.learningLibraryEntry = learningLibraryEntry;
+				
+				iconImage = new Image();
+				iconImage.source = learningLibraryEntry.icon;
+				this.addChild(iconImage);
+	
+				title = new Label();
+				title.text = learningLibraryEntry.title;
+				this.addChild(title);
+				
+				// Adding event listener for drag
+				addEventListener(MouseEvent.MOUSE_MOVE, mouseMoveHandler);
+			}
+			
+			
+			// The mouseMove event handler for the Image control
+	        // initiates the drag-and-drop operation.
+	        private function mouseMoveHandler(event:MouseEvent):void 
+	        {                
+	        	var dragInitiator:LearningLibraryEntryComponent = event.currentTarget as LearningLibraryEntryComponent;
+	        	var ds:DragSource = new DragSource();
+	        	
+	        	if (dragInitiator.learningLibraryEntry.isCombined) {
+	        		var combinedAactivityComponent:CombinedActivityComponent = new CombinedActivityComponent();
+	        		combinedAactivityComponent.learningLibraryEntry = dragInitiator.learningLibraryEntry
+	        		combinedAactivityComponent.load();
+					combinedAactivityComponent.x = UIComponent(event.currentTarget).mouseX;
+          			combinedAactivityComponent.y = UIComponent(event.currentTarget).mouseY; 
+          			ds.addData(combinedAactivityComponent, "img"); 
+	            	DragManager.doDrag(dragInitiator, ds, event, combinedAactivityComponent, 25, 15, 1.00, false);   
+	        	} else {
+	        		var toolActivityComponent:ToolActivityComponent = new ToolActivityComponent();
+	        		toolActivityComponent.tool = dragInitiator.learningLibraryEntry.toolTemplates[0];
+	        		toolActivityComponent.load();
+					toolActivityComponent.x = UIComponent(event.currentTarget).mouseX;
+          			toolActivityComponent.y = UIComponent(event.currentTarget).mouseY;
+          			ds.addData(toolActivityComponent, "img"); 
+	            	DragManager.doDrag(dragInitiator, ds, event, toolActivityComponent, 25, 15, 1.00, false);   
+	        	}
+	        }
+		]]>
+	</mx:Script>
+</mx:HBox>
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/LearningLibraryEntryComponent2.mxml
===================================================================
diff -u
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/LearningLibraryEntryComponent2.mxml	(revision 0)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/LearningLibraryEntryComponent2.mxml	(revision 3fb93ca162c53177b3ddfdf836c47bf868e144ff)
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<mx:VBox xmlns:mx="http://www.adobe.com/2006/mxml" 
+	minWidth="100" height="100%" 
+	verticalAlign="middle" horizontalAlign="center"
+	horizontalScrollPolicy="off"
+	>
+	
+	<mx:Script>
+		<![CDATA[
+			import org.lamsfoundation.lams.author.model.learninglibrary.LearningLibraryEntry;
+			import org.lamsfoundation.lams.author.components.activity.*;
+			import org.lamsfoundation.lams.author.util.Constants;
+			import mx.controls.Image;
+			import mx.controls.Label;
+			import mx.core.DragSource;
+			import mx.managers.DragManager;
+			import mx.core.UIComponent;
+			
+			public var iconImage:Image;
+			public var title:Label;
+			public var learningLibraryEntry:LearningLibraryEntry;
+					
+			public function load():void {
+				this.learningLibraryEntry = learningLibraryEntry;
+
+				var vbox:VBox = new VBox();
+				vbox.height = 40;
+				vbox.width = 50;
+				vbox.setConstraintValue("verticalAlign", "middle");
+				vbox.setConstraintValue("horizontalAlign", "center");
+				vbox.setStyle('borderStyle', 'solid');
+				vbox.setStyle('dropShadowEnabled', true);
+				vbox.setStyle('shadowDirection', "right");
+				vbox.setStyle('cornerRadius', '10');
+				
+				switch (learningLibraryEntry.category) {
+   					case Constants.TOOL_CATEGORY_ASSESSMENT:
+   						// Color purple #98C73F
+   						vbox.setStyle("backgroundColor", "#E9E2F5");
+   						break;
+   					case Constants.TOOL_CATEGORY_INFORMATIVE:
+   						// Color peach #FFEEC8
+   						vbox.setStyle("backgroundColor", "#FFEEC8");
+   						break;
+   					case Constants.TOOL_CATEGORY_REFLECTIVE:
+   						// Color green #DDFCB1
+   						vbox.setStyle("backgroundColor", "#DDFCB1");
+   						break;
+   					case Constants.TOOL_CATEGORY_COLLABORATIVE:
+   						// Color yellow #FFFDBE
+   						vbox.setStyle("backgroundColor", "#FFFDBE");
+   						break;
+   				}
+   				
+   				iconImage = new Image();
+   				iconImage.height = 30;
+   				iconImage.width = 30;
+				iconImage.source = learningLibraryEntry.icon;	
+   				vbox.addChild(iconImage);
+				
+				
+				this.addChild(vbox);
+				
+				//icon = new Image();
+				//icon.source = learningLibraryEntry.icon;			
+				//this.addChild(icon);
+	
+				title = new Label();
+				title.text = learningLibraryEntry.title;
+				this.addChild(title);
+				
+				// Adding event listener for drag
+				addEventListener(MouseEvent.MOUSE_MOVE, mouseMoveHandler);
+			}
+			
+			
+			// The mouseMove event handler for the Image control
+	        // initiates the drag-and-drop operation.
+	        private function mouseMoveHandler(event:MouseEvent):void 
+	        {                
+	        	var dragInitiator:LearningLibraryEntryComponent2 = event.currentTarget as LearningLibraryEntryComponent2;
+	        	var ds:DragSource = new DragSource();
+	        	
+	        	if (dragInitiator != null) {
+
+		        	if (dragInitiator.learningLibraryEntry.isCombined) {
+		        		var combinedAactivityComponent:CombinedActivityComponent = new CombinedActivityComponent();
+		        		combinedAactivityComponent.learningLibraryEntry = dragInitiator.learningLibraryEntry;
+		        		combinedAactivityComponent.load();
+						combinedAactivityComponent.x = UIComponent(event.currentTarget).mouseX;
+	          			combinedAactivityComponent.y = UIComponent(event.currentTarget).mouseY; 
+	          			ds.addData(combinedAactivityComponent, "img"); 
+		            	DragManager.doDrag(dragInitiator, ds, event, combinedAactivityComponent, 25, 15, 1.00, false);   
+		        	} else {
+		        		var toolActivityComponent:ToolActivityComponent = new ToolActivityComponent();
+		        		toolActivityComponent.tool = dragInitiator.learningLibraryEntry.toolTemplates[0];
+		        		toolActivityComponent.load();
+						toolActivityComponent.x = UIComponent(event.currentTarget).mouseX;
+	          			toolActivityComponent.y = UIComponent(event.currentTarget).mouseY;
+	          			ds.addData(toolActivityComponent, "img"); 
+		            	DragManager.doDrag(dragInitiator, ds, event, toolActivityComponent, 25, 15, 1.00, false);   
+		        	}
+	        	}
+	           
+	        }
+		]]>
+	</mx:Script>
+</mx:VBox>
Fisheye: Tag 3fb93ca162c53177b3ddfdf836c47bf868e144ff refers to a dead (removed) revision in file `lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.as'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.mxml
===================================================================
diff -u
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.mxml	(revision 0)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.mxml	(revision 3fb93ca162c53177b3ddfdf836c47bf868e144ff)
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="utf-8"?>
+<mx:VBox xmlns:mx="http://www.adobe.com/2006/mxml"
+	mouseMove="mouseMove(event)"
+	mouseDown="mouseDown(event)"
+	mouseOver="mouseOver(event)" 
+	mouseOut="mouseOut(event)"
+	
+	>
+
+	<!--
+	Root component for the activities. 
+	All activities inherit from this component
+	-->
+
+	<mx:Script>
+		<![CDATA[
+			import mx.managers.DragManager;
+			import mx.core.DragSource;
+			import org.lamsfoundation.lams.author.util.Constants;
+			import mx.core.Application;
+			import org.lamsfoundation.lams.author.events.TransitionEvent;
+			import mx.controls.Label;
+			import org.lamsfoundation.lams.author.components.transition.TransitionComponent;
+			
+			public var xpos:int;
+			public var ypos:int;
+			public var title:Label;
+			
+			public var centerX:int;
+			public var centerY:int;
+			
+			private var transitionIn:TransitionComponent
+			private var transitionOut:TransitionComponent;
+			
+			
+			private var state:int = Constants.ACTIVITY_STATE_NORMAL;
+			
+			// Function used to load a new activity 
+			public function load():void { 	
+		    }
+			
+			
+			// The mouseMove event handler for the Image control
+		    // initiates the drag-and-drop operation.
+		    protected function mouseMove(event:MouseEvent):void 
+		    {                
+		        switch (Application.application.cursorState) {
+		        	case Constants.CURSOR_STATE_NORMAL:
+		        		var activityComponent:ActivityComponent = event.currentTarget as ActivityComponent;
+				        var ds:DragSource = new DragSource();
+				        ds.addData(activityComponent, "img");               
+				        DragManager.doDrag(activityComponent, ds, event);
+				        setCenter();
+				   		
+				   		if (transitionOut != null)
+				   		{
+				   			transitionOut.startX = centerX;
+				   			transitionOut.startY = centerY;
+				   			transitionOut.invalidateDisplayList();
+				   		} 
+				   		
+				   		
+				   		if (transitionIn != null) {
+				   			transitionIn.endX = centerX;
+				   			transitionIn.endY = centerY;
+				   			transitionIn.invalidateDisplayList();
+				   		}
+				   		
+				        break;
+		        }
+		    }
+
+		    protected function mouseDown(event:MouseEvent):void {
+		    	
+		    	switch (Application.application.cursorState) {
+		    		case Constants.CURSOR_STATE_TRANSITION:
+		    		var transitionEvent:TransitionEvent = new TransitionEvent(TransitionEvent.TRANSITION_EVENT);
+		    		transitionEvent.sourceAcivityComponent = this;
+		    		transitionEvent.localX = event.localX;
+		    		transitionEvent.localY = event.localY;
+		    		//Application.application.dispatchEvent(transitionEvent);
+		    		startDragging(transitionEvent)
+		    		break;	
+		    	}
+		    	
+		    }
+		    
+		    public function setCenter():void {
+		    	centerX = x + height/2;
+				centerY = y + height/2 -10;
+		    }
+		    
+	        protected function startDragging(event:TransitionEvent):void {
+			 
+				if (transitionOut != null) {
+					parent.removeChild(transitionOut);
+				}
+				
+				setCenter();
+				
+				state = Constants.ACTIVITY_STATE_DRAWING;
+
+				Application.application.uiState = Constants.UI_STATE_DRAWING;
+				transitionOut = new TransitionComponent();
+				transitionOut.startX = event.sourceAcivityComponent.centerX;
+				transitionOut.startY = event.sourceAcivityComponent.centerY;
+				transitionOut.endX = event.sourceAcivityComponent.centerX;
+				transitionOut.endY = event.sourceAcivityComponent.centerY;
+				transitionOut.invalidateProperties();
+				
+				parent.addChild(transitionOut);
+				
+				systemManager.addEventListener(MouseEvent.MOUSE_MOVE, systemManagerMouseMoveHandler, true);
+				systemManager.addEventListener(MouseEvent.MOUSE_UP, systemManagerMouseUpHandler, true);
+				systemManager.stage.addEventListener(Event.MOUSE_LEAVE, stageMouseLeaveHandler);
+			
+			}
+			
+			protected function stopDragging():void
+			{
+			    Application.application.uiState = Constants.UI_STATE_NORMAL;
+			    systemManager.removeEventListener(MouseEvent.MOUSE_MOVE, systemManagerMouseMoveHandler, true);			
+			    systemManager.removeEventListener(MouseEvent.MOUSE_UP, systemManagerMouseUpHandler, true);
+			    systemManager.stage.removeEventListener(Event.MOUSE_LEAVE, stageMouseLeaveHandler);
+			}
+			
+			private function systemManagerMouseMoveHandler(event:MouseEvent):void
+		    {
+		    	var pt:Point = new Point(event.stageX,event.stageY);
+		    	pt = parent.globalToLocal(pt);
+		    	
+		    	transitionOut.endX = pt.x;
+		    	transitionOut.endY = pt.y;
+		    	
+		    	transitionOut.invalidateDisplayList();
+		    }
+		    
+		    private function systemManagerMouseUpHandler(event:MouseEvent):void
+		    {
+		    	stopDragging();
+		    	
+		    	var validTransition:Boolean = false;
+		    	for (var i:int = 0; i < parent.numChildren; i++) {
+		    		
+		    		if (parent.getChildAt(i) is ActivityComponent) {
+		    			
+		    			var activityComponent:ActivityComponent = parent.getChildAt(i) as ActivityComponent;
+		    			if (activityComponent.state == Constants.ACTIVITY_STATE_MOUSE_OVER) {
+		    				activityComponent.transitionIn = transitionOut;	
+		    				validTransition = true;		
+		    			}
+		    		}
+		    	}
+		    	
+		    	if (!validTransition) {
+		    		parent.removeChild(transitionOut);
+		    		transitionOut = null;
+		    	}
+		    	
+		    }
+		    
+		    private function stageMouseLeaveHandler(event:MouseEvent):void
+		    {
+		    	stopDragging();
+		    }
+		    
+		    private function mouseOver(event:MouseEvent):void {
+				
+				if (Application.application.uiState == Constants.UI_STATE_DRAWING && this.state != Constants.ACTIVITY_STATE_DRAWING) {
+					this.setStyle('borderStyle', 'solid');
+					this.setStyle('borderColor', '#66CCFF');
+					this.state = Constants.ACTIVITY_STATE_MOUSE_OVER;
+				}
+				
+			}
+			
+			private function mouseOut(event:MouseEvent):void {
+				this.setStyle('borderStyle', 'none');
+			}
+			
+			
+		]]>
+	</mx:Script>
+	
+	
+</mx:VBox>
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/CombinedActivityComponent.mxml
===================================================================
diff -u -re11155f5e0c1a923e08fcd2ce2f57873bc1c6904 -r3fb93ca162c53177b3ddfdf836c47bf868e144ff
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/CombinedActivityComponent.mxml	(.../CombinedActivityComponent.mxml)	(revision e11155f5e0c1a923e08fcd2ce2f57873bc1c6904)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/CombinedActivityComponent.mxml	(.../CombinedActivityComponent.mxml)	(revision 3fb93ca162c53177b3ddfdf836c47bf868e144ff)
@@ -3,6 +3,7 @@
 	xmlns:mx="http://www.adobe.com/2006/mxml" 
 	verticalAlign="middle" horizontalAlign="center" 
 	horizontalScrollPolicy="off" 
+	paddingTop="3" paddingLeft="3" paddingRight="6" paddingBottom="3"
 	>
 	
 	<mx:Script>
@@ -15,37 +16,45 @@
 			
 			public var toolActivityComponent1:ToolActivityComponent;
 			public var toolActivityComponent2:ToolActivityComponent;
-			public var learningLibraryEntry:LearningLibraryEntry;	
+			public var learningLibraryEntry:LearningLibraryEntry;
 			
 			override public function load():void {
 				
 				var vbox:VBox = new VBox();
 				vbox.setConstraintValue("verticalAlign", "middle");
+				vbox.setConstraintValue("verticalGap", 0);
 				vbox.setConstraintValue("horizontalAlign", "center");
 				vbox.setStyle('borderStyle', 'solid');
 				vbox.setStyle('dropShadowEnabled', true);
 				vbox.setStyle('shadowDirection', "right");
 				vbox.setStyle('cornerRadius', '10');
 				vbox.setStyle('backgroundColor', '#C2D5FE');
+				vbox.setStyle('paddingTop', 6);
+				vbox.setStyle('paddingBottom', 4);
 				vbox.horizontalScrollPolicy = "off";
-				vbox.height = 150;
+				vbox.height = 120;
 				vbox.minWidth = 100;
 				
-				
 				var tool1:Tool = learningLibraryEntry.toolTemplates[1];
 				var tool2:Tool = learningLibraryEntry.toolTemplates[2];
 				
 				if (tool1 != null) {
 					toolActivityComponent1 = new ToolActivityComponent();
 					toolActivityComponent1.tool = learningLibraryEntry.toolTemplates[1];
 					toolActivityComponent1.load();
+					toolActivityComponent1.toolTip = toolActivityComponent1.title.text;
+					toolActivityComponent1.title.visible = false;
+					toolActivityComponent1.title.height = 0;
 					vbox.addChild(toolActivityComponent1);
 				}
 				
 				if (tool1 != null) {
 					toolActivityComponent2 = new ToolActivityComponent();
 					toolActivityComponent2.tool = learningLibraryEntry.toolTemplates[2];
 					toolActivityComponent2.load();
+					toolActivityComponent2.toolTip = toolActivityComponent2.title.text;
+					toolActivityComponent2.title.visible = false;
+					toolActivityComponent2.title.height = 0;
 					vbox.addChild(toolActivityComponent2);
 				}
 				
@@ -55,7 +64,6 @@
    				title.text = learningLibraryEntry.title;
    				this.addChild(title);
 				
-				addEventListener(MouseEvent.MOUSE_MOVE, mouseMoveHandler);
 			}
 			
 		]]>
Fisheye: Tag 3fb93ca162c53177b3ddfdf836c47bf868e144ff refers to a dead (removed) revision in file `lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/LearningLibraryEntryComponent.mxml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 3fb93ca162c53177b3ddfdf836c47bf868e144ff refers to a dead (removed) revision in file `lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/LearningLibraryEntryComponent2.mxml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ToolActivityComponent.mxml
===================================================================
diff -u -re11155f5e0c1a923e08fcd2ce2f57873bc1c6904 -r3fb93ca162c53177b3ddfdf836c47bf868e144ff
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ToolActivityComponent.mxml	(.../ToolActivityComponent.mxml)	(revision e11155f5e0c1a923e08fcd2ce2f57873bc1c6904)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ToolActivityComponent.mxml	(.../ToolActivityComponent.mxml)	(revision 3fb93ca162c53177b3ddfdf836c47bf868e144ff)
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ActivityComponent xmlns="org.lamsfoundation.lams.author.components.activity.*" 
 	xmlns:mx="http://www.adobe.com/2006/mxml" 
-	verticalAlign="middle" horizontalAlign="center" horizontalScrollPolicy="off">
+	verticalAlign="middle" horizontalAlign="center" horizontalScrollPolicy="off" 
+	paddingTop="3" paddingLeft="3" paddingRight="3" paddingBottom="3"
+	>
 	
 	<mx:Script>
 		<![CDATA[
+			import mx.core.Application;
 			import org.lamsfoundation.lams.author.model.learninglibrary.Tool;
 			import mx.containers.HBox;
 			import mx.containers.VBox;
@@ -19,7 +22,7 @@
 			public var tool:Tool;
 
 			
-			public override function load():void {
+			 override public function load():void {
 				
 				var vbox:VBox = new VBox();
 				vbox.setConstraintValue("verticalAlign", "middle");
@@ -57,10 +60,10 @@
    				title.text = tool.toolName;
    				this.addChild(title);
    				
-   				addEventListener(MouseEvent.MOUSE_MOVE, mouseMoveHandler);
-   				addEventListener(MouseEvent.MOUSE_DOWN, mouseDown);
 			}
 			
+			
+			
 		]]>
 	</mx:Script>
 	
Fisheye: Tag 3fb93ca162c53177b3ddfdf836c47bf868e144ff refers to a dead (removed) revision in file `lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/transition/Transition.as'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/transition/TransitionComponent.as
===================================================================
diff -u
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/transition/TransitionComponent.as	(revision 0)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/transition/TransitionComponent.as	(revision 3fb93ca162c53177b3ddfdf836c47bf868e144ff)
@@ -0,0 +1,42 @@
+package org.lamsfoundation.lams.author.components.transition
+{
+	import com.dncompute.graphics.GraphicsUtil;
+	
+	import flash.geom.Point;
+	
+	public class TransitionComponent extends DrawingTool
+	{
+		
+
+		public function TransitionComponent()
+		{
+		}
+		
+		override protected function updateDisplayList(unscaledWidth:Number, unscaledHeight:Number):void {
+			
+			var origin:Point = new Point(startX,startY);
+			var destination:Point = new Point(endX,endY);
+			
+			var lineThickness:Number = 2;
+			var lineColor:Number = 0x999999;
+			var lineAlpha:Number = 1;
+			
+			// Find the middle point to draw the arrow
+			var middle:Point = Point.interpolate(origin, destination, 0.4);
+			var middle1:Point = Point.interpolate(origin, destination, 0.41);
+			
+			// Draw an arrow to half-way
+			graphics.clear();
+			graphics.beginFill(lineColor,lineAlpha);
+			GraphicsUtil.drawArrow(graphics,origin,middle, {shaftThickness:lineThickness,headWidth:15,headLength:15, shaftPosition:0,edgeControlPosition:0.5});
+			
+			// Draw the rest of the line
+			graphics.lineStyle(2, 0x999999, 1);
+			graphics.moveTo(middle1.x,middle1.y);
+			graphics.lineTo(endX,endY);
+			parent.setChildIndex(this, 0);
+
+		}
+
+	}
+}
\ No newline at end of file
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/util/Constants.as
===================================================================
diff -u -re11155f5e0c1a923e08fcd2ce2f57873bc1c6904 -r3fb93ca162c53177b3ddfdf836c47bf868e144ff
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/util/Constants.as	(.../Constants.as)	(revision e11155f5e0c1a923e08fcd2ce2f57873bc1c6904)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/util/Constants.as	(.../Constants.as)	(revision 3fb93ca162c53177b3ddfdf836c47bf868e144ff)
@@ -17,5 +17,14 @@
 	    public static const CURSOR_STATE_TRANSITION:int = 2;
 	    public static const CURSOR_STATE_DATAFLOW:int = 3;
 	    public static const CURSOR_STATE_HELP:int = 4;
+	    
+	    
+	    public static const UI_STATE_NORMAL:int = 1;
+	    public static const UI_STATE_DRAWING:int = 2;
+	    
+	    
+	    public static const ACTIVITY_STATE_NORMAL:int = 1;
+	    public static const ACTIVITY_STATE_DRAWING:int = 2;
+	    public static const ACTIVITY_STATE_MOUSE_OVER:int = 3;
 	}
 }
\ No newline at end of file