Fisheye: Tag af5f3cc7b21dbdc9b69d6df126409c75f4e64633 refers to a dead (removed) revision in file `lams_flex/LamsAuthor/LearningLibrary2.mxml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag af5f3cc7b21dbdc9b69d6df126409c75f4e64633 refers to a dead (removed) revision in file `lams_flex/LamsAuthor/LearningLibraryEntryComponent.as'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag af5f3cc7b21dbdc9b69d6df126409c75f4e64633 refers to a dead (removed) revision in file `lams_flex/LamsAuthor/ToolActivityComponent.as'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_flex/LamsAuthor/bin-debug/assets/css/learningLibrary.css
===================================================================
diff -u -r0ecb7cb6cb1caf3300646c6211d23f9026d28c75 -raf5f3cc7b21dbdc9b69d6df126409c75f4e64633
--- lams_flex/LamsAuthor/bin-debug/assets/css/learningLibrary.css	(.../learningLibrary.css)	(revision 0ecb7cb6cb1caf3300646c6211d23f9026d28c75)
+++ lams_flex/LamsAuthor/bin-debug/assets/css/learningLibrary.css	(.../learningLibrary.css)	(revision af5f3cc7b21dbdc9b69d6df126409c75f4e64633)
@@ -1,5 +1,10 @@
 /* CSS file */
 
+.learningLibrary {
+	background-color:#C2D5FE;
+	color:#000000;	
+}
+
 .linkButtonWindowShade {
   	headerClass:ClassReference('mx.controls.LinkButton');
   	header-style-name: linkButtonStyle;
@@ -36,7 +41,6 @@
    	use-roll-over: false;
    	roll-over-color:#FFEEC8;
    	selectionColor:#FFEEC8;
-
 }
 
 .reflective {
Index: lams_flex/LamsAuthor/src/LamsAuthor.mxml
===================================================================
diff -u -r3fb93ca162c53177b3ddfdf836c47bf868e144ff -raf5f3cc7b21dbdc9b69d6df126409c75f4e64633
--- lams_flex/LamsAuthor/src/LamsAuthor.mxml	(.../LamsAuthor.mxml)	(revision 3fb93ca162c53177b3ddfdf836c47bf868e144ff)
+++ lams_flex/LamsAuthor/src/LamsAuthor.mxml	(.../LamsAuthor.mxml)	(revision af5f3cc7b21dbdc9b69d6df126409c75f4e64633)
@@ -4,11 +4,14 @@
 	verticalAlign="left"
 	xmlns:components="org.lamsfoundation.lams.author.components.*"
 	xmlns:maps="org.lamsfoundation.lams.author.maps.*" 
+	xmlns:flexlib="http://code.google.com/p/flexlib/"
 	preinitialize="preInit()"
 	>
 
 	<mx:Script>
 		<![CDATA[
+			import mx.managers.CursorManager;
+			import mx.events.MenuEvent;
 			import org.lamsfoundation.lams.author.util.Constants;
 			import mx.rpc.events.ResultEvent;
 			import org.lamsfoundation.lams.common.util.WDDXParser;
@@ -33,6 +36,10 @@
 			// ui state
 			public var uiState:int = Constants.UI_STATE_NORMAL;
 			
+        	
+        	[Bindable]
+            [Embed("assets/icons/optional.png")]
+            public var optionalIcon:Class; 
 			
 			private function preInit():void {
 				
@@ -44,6 +51,25 @@
 				
 				mainMap.init();
 			}
+		
+			
+			[Embed("assets/icons/transition.png")]
+            public var transitionCursor:Class;
+
+			public function changeCursorState(state:int):void{
+				cursorState = state;
+				
+				switch (cursorState) {
+					case Constants.CURSOR_STATE_NORMAL:
+						CursorManager.removeCursor(CursorManager.currentCursorID);
+						break;
+					case Constants.CURSOR_STATE_TRANSITION:
+						CursorManager.setCursor(transitionCursor);
+						break;
+				}
+			
+			
+			}
 		]]>
 	</mx:Script>
 
@@ -55,29 +81,11 @@
 		height="50"
 	/>-->
 	
-	<mx:MenuBar id="myMenuBar" labelField="@label" width="100%">
-        <mx:XMLList>
-            <menuitem label="File">
-                <menuitem label="SubMenuItem A-1" enabled="false"/>
-                <menuitem label="SubMenuItem A-2"/>
-            </menuitem>
-            <menuitem label="Edit"/>
-            <menuitem label="Tools"/>
-            <menuitem label="Help">
-                <menuitem label="SubMenuItem D-1" 
-                    type="radio" groupName="one"/>
-                <menuitem label="SubMenuItem D-2" 
-                    type="radio" groupName="one"
-                    selected="true"/>
-                <menuitem label="SubMenuItem D-3" 
-                    type="radio" groupName="one"/>
-            </menuitem>
-        </mx:XMLList>
-    </mx:MenuBar>
-
 	
+	<components:ToolBar id="toolBar" width="100%" ></components:ToolBar>
+	
 		
-	<components:CanvasArea height="100%" width="100%" id="canvasArea" top="20"
+	<components:CanvasArea height="100%" width="100%" id="canvasArea" top="30"
 		backgroundColor="#FFFFF8" >
 	</components:CanvasArea>
 	
Fisheye: Tag af5f3cc7b21dbdc9b69d6df126409c75f4e64633 refers to a dead (removed) revision in file `lams_flex/LamsAuthor/src/assets/css/activities.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_flex/LamsAuthor/src/assets/css/learningLibrary.css
===================================================================
diff -u -r3fb93ca162c53177b3ddfdf836c47bf868e144ff -raf5f3cc7b21dbdc9b69d6df126409c75f4e64633
--- lams_flex/LamsAuthor/src/assets/css/learningLibrary.css	(.../learningLibrary.css)	(revision 3fb93ca162c53177b3ddfdf836c47bf868e144ff)
+++ lams_flex/LamsAuthor/src/assets/css/learningLibrary.css	(.../learningLibrary.css)	(revision af5f3cc7b21dbdc9b69d6df126409c75f4e64633)
@@ -1,5 +1,10 @@
 /* CSS file */
 
+.learningLibrary {
+	background-color:#C2D5FE;
+	color:#000000;	
+}
+
 .linkButtonWindowShade {
   	headerClass:ClassReference('mx.controls.LinkButton');
   	header-style-name: linkButtonStyle;
@@ -36,7 +41,6 @@
    	use-roll-over: false;
    	roll-over-color:#FFEEC8;
    	selectionColor:#FFEEC8;
-
 }
 
 .reflective {
Index: lams_flex/LamsAuthor/src/assets/css/toolBar.css
===================================================================
diff -u
--- lams_flex/LamsAuthor/src/assets/css/toolBar.css	(revision 0)
+++ lams_flex/LamsAuthor/src/assets/css/toolBar.css	(revision af5f3cc7b21dbdc9b69d6df126409c75f4e64633)
@@ -0,0 +1,6 @@
+/* CSS file */
+
+.toolBar {
+	background-color:#C2D5FE;
+	color:#000000;	
+}
Index: lams_flex/LamsAuthor/src/assets/icons/copy.png
===================================================================
diff -u
Binary files differ
Index: lams_flex/LamsAuthor/src/assets/icons/flow.png
===================================================================
diff -u
Binary files differ
Index: lams_flex/LamsAuthor/src/assets/icons/group.png
===================================================================
diff -u
Binary files differ
Index: lams_flex/LamsAuthor/src/assets/icons/new.png
===================================================================
diff -u
Binary files differ
Index: lams_flex/LamsAuthor/src/assets/icons/open.png
===================================================================
diff -u
Binary files differ
Index: lams_flex/LamsAuthor/src/assets/icons/optional.png
===================================================================
diff -u
Binary files differ
Index: lams_flex/LamsAuthor/src/assets/icons/paste.png
===================================================================
diff -u
Binary files differ
Index: lams_flex/LamsAuthor/src/assets/icons/preview.png
===================================================================
diff -u
Binary files differ
Index: lams_flex/LamsAuthor/src/assets/icons/save.png
===================================================================
diff -u
Binary files differ
Index: lams_flex/LamsAuthor/src/assets/icons/transition.png
===================================================================
diff -u
Binary files differ
Index: lams_flex/LamsAuthor/src/assets/icons/zoom_in.png
===================================================================
diff -u
Binary files differ
Index: lams_flex/LamsAuthor/src/assets/icons/zoom_out.png
===================================================================
diff -u
Binary files differ
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasArea.mxml
===================================================================
diff -u -r3fb93ca162c53177b3ddfdf836c47bf868e144ff -raf5f3cc7b21dbdc9b69d6df126409c75f4e64633
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasArea.mxml	(.../CanvasArea.mxml)	(revision 3fb93ca162c53177b3ddfdf836c47bf868e144ff)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasArea.mxml	(.../CanvasArea.mxml)	(revision af5f3cc7b21dbdc9b69d6df126409c75f4e64633)
@@ -6,6 +6,7 @@
 	
 	<mx:Script>
 		<![CDATA[
+			import mx.core.Application;
 			import mx.controls.Label;
 			import mx.controls.Image;
 			import mx.core.Container;
@@ -101,42 +102,43 @@
 	              		toolActivityComponent.y = UIComponent(event.currentTarget).mouseY;
 	                	canvasBox.addChild(toolActivityComponent);
                 	}
-                }                    
+                }  
+                
+                                  
             }
             
-             private function maximizeLearningLibrary():void {
+            /* 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>
 	
 	
 	
 	<components:LearningLibrary id="compLearningLibrary"
-			height="100%" width="190"
+			height="{Application.application.height - 30}" width="190" verticalScrollPolicy="on"
 		/>	
 	<mx:HBox id="canvasblock" height="100%" width="25" verticalAlign="middle" >
 		<mx:Button id="hideButton" label="&lt;" click="toggleLearningLibrary()" 
 			width="25" paddingLeft="0" textAlign="right" />
 	</mx:HBox>
-	<!--<mx:HSlider id="zoomSlider" minimum="0.8" value="1.5"
-			maximum="3" change="applyZoom()" width="150"/>-->
+	
 	<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>
 			    
-				<mx:Button horizontalCenter="0" bottom="0" click="maximizeLearningLibrary()" label="^"></mx:Button>
+				<!--<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 -r0ecb7cb6cb1caf3300646c6211d23f9026d28c75 -raf5f3cc7b21dbdc9b69d6df126409c75f4e64633
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasBox.mxml	(.../CanvasBox.mxml)	(revision 0ecb7cb6cb1caf3300646c6211d23f9026d28c75)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasBox.mxml	(.../CanvasBox.mxml)	(revision af5f3cc7b21dbdc9b69d6df126409c75f4e64633)
@@ -8,6 +8,8 @@
 	
 	<mx:Script>
 		<![CDATA[
+			import org.lamsfoundation.lams.author.util.Constants;
+			import mx.core.Application;
 			import mx.controls.Alert;
 			import mx.core.UIComponent;
 			import org.lamsfoundation.lams.author.components.activity.*;
@@ -60,7 +62,10 @@
 	                	this.addChild(toolActivityComponent);
 	                	toolActivityComponent.setCenter();
                 	}
-                }                    
+                }
+                
+                // Return cursor state to normal
+				Application.application.changeCursorState(Constants.CURSOR_STATE_NORMAL);                    
             }
             
             
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/LearningLibrary.mxml
===================================================================
diff -u -r3fb93ca162c53177b3ddfdf836c47bf868e144ff -raf5f3cc7b21dbdc9b69d6df126409c75f4e64633
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/LearningLibrary.mxml	(.../LearningLibrary.mxml)	(revision 3fb93ca162c53177b3ddfdf836c47bf868e144ff)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/LearningLibrary.mxml	(.../LearningLibrary.mxml)	(revision af5f3cc7b21dbdc9b69d6df126409c75f4e64633)
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <mx:VBox xmlns:mx="http://www.adobe.com/2006/mxml" 
-	backgroundColor="#C2D5FE" 
+	styleName="learningLibrary"
 	xmlns:flexlib="http://code.google.com/p/flexlib/"
-	paddingTop="10" paddingLeft="5" paddingRight="5" paddingBottom="10"
-	
+	paddingTop="10" paddingLeft="2" paddingRight="5" paddingBottom="10"
+	borderStyle="solid"
+	dropShadowEnabled="true"
+	shadowDirection="right"
+	horizontalScrollPolicy="off"
 	>
 
 	<mx:Style source="assets/css/learningLibrary.css" />
@@ -58,23 +61,23 @@
 	</mx:Script>
 	
 	<flexlib:WindowShade id="wsAll" tabChildren="{wsInformative.opened}" styleName="all" opened="false"
-      	label="All" width="100%" paddingLeft="20" paddingBottom="20"  shadowDirection="right">	
+      	label="All" width="100%" paddingLeft="10" 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">	
+      	label="Informative" width="100%" paddingLeft="10" 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" >
+      	label="Reflective" width="100%" paddingLeft="10" 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" >
+      	label="Collaborative" width="100%" paddingLeft="10" 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" > 
+      	label="Asessment" width="100%" paddingLeft="10" paddingBottom="20" backgroundColor="#E9E2F5" shadowDirection="right" > 
     </flexlib:WindowShade>
     
 </mx:VBox>
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/LearningLibraryEntryComponent.mxml
===================================================================
diff -u -r3fb93ca162c53177b3ddfdf836c47bf868e144ff -raf5f3cc7b21dbdc9b69d6df126409c75f4e64633
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/LearningLibraryEntryComponent.mxml	(.../LearningLibraryEntryComponent.mxml)	(revision 3fb93ca162c53177b3ddfdf836c47bf868e144ff)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/LearningLibraryEntryComponent.mxml	(.../LearningLibraryEntryComponent.mxml)	(revision af5f3cc7b21dbdc9b69d6df126409c75f4e64633)
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<mx:HBox xmlns:mx="http://www.adobe.com/2006/mxml" width="100%" height="30" verticalAlign="middle">
+<mx:HBox xmlns:mx="http://www.adobe.com/2006/mxml" 
+	width="100%" height="25" 
+	verticalAlign="middle" 
+	horizontalGap="0"
+	>
 	
 	<mx:Script>
 		<![CDATA[
@@ -21,6 +25,7 @@
 				
 				iconImage = new Image();
 				iconImage.source = learningLibraryEntry.icon;
+				iconImage.height = 25;
 				this.addChild(iconImage);
 	
 				title = new Label();
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/ToolBar.mxml
===================================================================
diff -u
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/ToolBar.mxml	(revision 0)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/ToolBar.mxml	(revision af5f3cc7b21dbdc9b69d6df126409c75f4e64633)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<mx:HBox xmlns:mx="http://www.adobe.com/2006/mxml"
+	horizontalGap="5" verticalAlign="middle"
+	styleName="toolBar"
+	>
+	
+	<mx:Style source="assets/css/toolBar.css" />
+	
+	<mx:Script>
+		<![CDATA[
+			import org.lamsfoundation.lams.author.util.Constants;
+			import mx.core.Application;
+		]]>
+	</mx:Script>
+	
+	<mx:MenuBar id="myMenuBar" labelField="@label" iconField="@icon" height="30" >
+	        <mx:XMLList>
+	            <menuitem label="File">
+	                <menuitem label="SubMenuItem A-1" enabled="false"/>
+	                <menuitem label="SubMenuItem A-2"/>
+	            </menuitem>
+	            <menuitem label="Edit"/>
+	            <menuitem label="Tools"/>
+	            <menuitem label="Show"/>
+	            <menuitem label="Help">
+	                <menuitem label="SubMenuItem D-1" 
+	                    type="radio" groupName="one"/>
+	                <menuitem label="SubMenuItem D-2" 
+	                    type="radio" groupName="one"
+	                    selected="true"/>
+	                <menuitem label="SubMenuItem D-3" 
+	                    type="radio" groupName="one"/>
+	            </menuitem>
+	        </mx:XMLList>
+	    </mx:MenuBar>
+	    <mx:Spacer width="5"></mx:Spacer>
+	    <mx:Button height="25" width="27" icon="@Embed(source='assets/icons/new.png')" toolTip="New Learning Design"></mx:Button>
+	    <mx:Button height="25" width="27" icon="@Embed(source='assets/icons/open.png')" toolTip="Open Learning Design"></mx:Button>
+	    <mx:Button height="25" width="27" icon="@Embed(source='assets/icons/save.png')" toolTip="Save"></mx:Button>
+	    <mx:Button height="25" width="27" icon="@Embed(source='assets/icons/copy.png')" toolTip="Copy Activity"></mx:Button>
+	    <mx:Button height="25" width="27" icon="@Embed(source='assets/icons/paste.png')" toolTip="Paste Activity"></mx:Button>
+	    <mx:Button height="25" width="27" icon="@Embed(source='assets/icons/zoom_in.png')" toolTip="Zoom Out"></mx:Button>
+	    <mx:Button height="25" width="27" icon="@Embed(source='assets/icons/zoom_out.png')" toolTip="Zoom In"></mx:Button>
+	    <mx:Spacer width="5"></mx:Spacer>
+	    <mx:Button height="25" icon="@Embed(source='assets/icons/transition.png')" label="Transition" click="Application.application.changeCursorState(Constants.CURSOR_STATE_TRANSITION)"></mx:Button>
+	    <mx:Button height="25" icon="@Embed(source='assets/icons/optional.png')" label="Optional"></mx:Button>
+	    <!--<mx:MenuBar labelField="@label" iconField="@icon" height="25" >
+	        <mx:XMLList>
+	            <menuitem label="Optional" icon="optionalIcon">
+	                <menuitem label="Activity" icon="optionalIcon"/>
+	                <menuitem label="Sequence" icon="optionalIcon"/>
+	                <menuitem label="Support" icon="optionalIcon"/>
+	            </menuitem>
+	        </mx:XMLList>
+	    </mx:MenuBar>-->
+	    <mx:Button height="25" icon="@Embed(source='assets/icons/flow.png')" label="Flow"></mx:Button>
+	    <mx:Button height="25" icon="@Embed(source='assets/icons/group.png')" label="Group"></mx:Button>
+	    <mx:Button height="25" icon="@Embed(source='assets/icons/preview.png')" label="Preview"></mx:Button>
+</mx:HBox>
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.mxml
===================================================================
diff -u -r0ecb7cb6cb1caf3300646c6211d23f9026d28c75 -raf5f3cc7b21dbdc9b69d6df126409c75f4e64633
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.mxml	(.../ActivityComponent.mxml)	(revision 0ecb7cb6cb1caf3300646c6211d23f9026d28c75)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.mxml	(.../ActivityComponent.mxml)	(revision af5f3cc7b21dbdc9b69d6df126409c75f4e64633)
@@ -144,7 +144,14 @@
 		    		transitionOut.graphics.clear();
 		    		parent.removeChild(transitionOut);
 		    		transitionOut = null;
+		    		
+		    		
 		    	}
+		    	else {
+		    		// Return cursor state to normal
+					Application.application.changeCursorState(Constants.CURSOR_STATE_NORMAL);
+
+		    	}
 		    	
 		    }
 		    
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/controller/AuthorController.as
===================================================================
diff -u -re11155f5e0c1a923e08fcd2ce2f57873bc1c6904 -raf5f3cc7b21dbdc9b69d6df126409c75f4e64633
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/controller/AuthorController.as	(.../AuthorController.as)	(revision e11155f5e0c1a923e08fcd2ce2f57873bc1c6904)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/controller/AuthorController.as	(.../AuthorController.as)	(revision af5f3cc7b21dbdc9b69d6df126409c75f4e64633)
@@ -30,7 +30,7 @@
    			// Set the application learning library
    			Application.application.learningLibrary = learningLibrary;
    			Application.application.canvasArea.compLearningLibrary.loadLearningLibrary();
-   			Application.application.canvasArea.compLearningLibrary2.loadLearningLibrary();
+   			//Application.application.canvasArea.compLearningLibrary2.loadLearningLibrary();
 			
 		}