Index: lams_flash/src/central/flex/VideoRecorder/src/AddCommentPopUp.mxml
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flex/VideoRecorder/src/AddCommentPopUp.mxml,v
diff -u -r1.3.2.1 -r1.3.2.2
--- lams_flash/src/central/flex/VideoRecorder/src/AddCommentPopUp.mxml	17 Apr 2009 08:21:52 -0000	1.3.2.1
+++ lams_flash/src/central/flex/VideoRecorder/src/AddCommentPopUp.mxml	19 May 2009 04:57:19 -0000	1.3.2.2
@@ -3,6 +3,9 @@
 
 	<mx:Script>
         <![CDATA[
+        	import mx.controls.TextInput;
+        	import mx.managers.FocusManager;
+        	import mx.core.UIComponent;
         	import mx.events.ValidationResultEvent;
         	import mx.validators.Validator;
         	import org.lamsfoundation.lams.common.dictionary.XMLDictionary;       
@@ -13,7 +16,7 @@
 	       	[Bindable] private var formIsValid:Boolean = false;
 	       	
 		   	private function onCreationComplete():void{
-		   		this.focusManager.setFocus(commentInput);
+		   		focusManager.setFocus(commentInput);
 		   	}
 		   	
 		   	public function init(dictionary:XMLDictionary):void{
@@ -41,17 +44,18 @@
 			
 			// validate a given validator
 			private function validate(validator:Validator):Boolean
-			{                
+			{   
 				var validatorSource:DisplayObject = validator.source as DisplayObject;
+				var component:UIComponent = validator.source as UIComponent;
 				var suppressEvents:Boolean = (validatorSource != focussedFormControl);
 				var event:ValidationResultEvent = validator.validate(null, suppressEvents); 
 				var currentControlIsValid:Boolean = (event.type == ValidationResultEvent.VALID);
+
 				
 				formIsValid = formIsValid && currentControlIsValid;
 				
 				return currentControlIsValid;
 			}
-			
         ]]>
     </mx:Script>
     
Index: lams_flash/src/central/flex/VideoRecorder/src/GetRecordingDetailsPopUp.mxml
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flex/VideoRecorder/src/GetRecordingDetailsPopUp.mxml,v
diff -u -r1.4.2.1 -r1.4.2.2
--- lams_flash/src/central/flex/VideoRecorder/src/GetRecordingDetailsPopUp.mxml	17 Apr 2009 08:21:51 -0000	1.4.2.1
+++ lams_flash/src/central/flex/VideoRecorder/src/GetRecordingDetailsPopUp.mxml	19 May 2009 04:57:19 -0000	1.4.2.2
@@ -3,6 +3,7 @@
 
 	<mx:Script>
         <![CDATA[
+        	import mx.controls.TextInput;
         	import mx.controls.Alert;
         	import mx.core.UITextField;
         	import mx.managers.IFocusManagerComponent;
@@ -20,7 +21,7 @@
 		   	private function onCreationComplete():void{
 		   		focusManager.setFocus(titleInput);
 		   	}
-		   			   	
+		   	
 		   	public function init(dictionary:XMLDictionary):void{
 		   		this.dictionary = dictionary;
 		   		this.title = dictionary.getLabel("videorecorder.new.recording.details");
@@ -58,15 +59,15 @@
 			private function validate(validator:Validator):Boolean
 			{   
 				var validatorSource:DisplayObject = validator.source as DisplayObject;
+				var component:UIComponent = validator.source as UIComponent;
 				var suppressEvents:Boolean = (validatorSource != focussedFormControl);
 				var event:ValidationResultEvent = validator.validate(null, suppressEvents); 
 				var currentControlIsValid:Boolean = (event.type == ValidationResultEvent.VALID);
-				
+							
 				formIsValid = formIsValid && currentControlIsValid;
 				
 				return currentControlIsValid;
 			}
-		   	
         ]]>
     </mx:Script>
     
Index: lams_flash/src/central/flex/VideoRecorder/src/HTTPServices.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flex/VideoRecorder/src/HTTPServices.as,v
diff -u -r1.3.2.1 -r1.3.2.2
Binary files differ
Index: lams_flash/src/central/flex/VideoRecorder/src/VideoInformation.mxml
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flex/VideoRecorder/src/VideoInformation.mxml,v
diff -u -r1.2 -r1.2.2.1
--- lams_flash/src/central/flex/VideoRecorder/src/VideoInformation.mxml	19 Feb 2009 05:36:32 -0000	1.2
+++ lams_flash/src/central/flex/VideoRecorder/src/VideoInformation.mxml	19 May 2009 04:57:18 -0000	1.2.2.1
@@ -87,8 +87,6 @@
 			<mx:Label id="descriptionLabel" text="Description:" fontStyle="italic"/>
 			<ns1:ResizeableTextArea id="description" width="100%" wordWrap="true" editable="false" verticalScrollPolicy="off" borderStyle="none"/>
 		</mx:VBox>
-		<mx:VBox width="100%" height="100%">
-		</mx:VBox>
 		<mx:VBox width="100%" id="commentsBox">
 			<mx:HRule width="100%" id="commentsRule"/>
 			<mx:Label id="commentsLabel" text="Comments:" fontStyle="italic"/>
Index: lams_flash/src/central/flex/VideoRecorder/src/VideoProfile.mxml
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flex/VideoRecorder/src/VideoProfile.mxml,v
diff -u -r1.3.2.1 -r1.3.2.2
--- lams_flash/src/central/flex/VideoRecorder/src/VideoProfile.mxml	17 Apr 2009 08:21:51 -0000	1.3.2.1
+++ lams_flash/src/central/flex/VideoRecorder/src/VideoProfile.mxml	19 May 2009 04:57:19 -0000	1.3.2.2
@@ -16,12 +16,12 @@
 			public var dictionary:XMLDictionary;
 			public var contentEditable:Boolean;
 		
-			[Embed(source="../../../../../../lams_central/web/images/icons/user.png")] [Bindable] private var userIcon:Class;
-			[Embed(source="../../../../../../lams_central/web/images/icons/date.png")] [Bindable] private var dateIcon:Class;
-			[Embed(source="../../../../../../lams_central/web/images/icons/pencil.png")] [Bindable] private var titleIcon:Class;
-			[Embed(source="../../../../../../lams_central/web/images/icons/note.png")] [Bindable] private var descriptionIcon:Class;
-			[Embed(source="../../../../../../lams_central/web/images/icons/cross.png")] [Bindable] private var deleteIcon:Class;
-			[Embed(source="../../../../../../lams_central/web/images/customer_logo.gif")] [Bindable] private var lamsIcon:Class;
+			[Embed(source="assets/images/user.png")] [Bindable] private var userIcon:Class;
+			[Embed(source="assets/images/date.png")] [Bindable] private var dateIcon:Class;
+			[Embed(source="assets/images/pencil.png")] [Bindable] private var titleIcon:Class;
+			[Embed(source="assets/images/note.png")] [Bindable] private var descriptionIcon:Class;
+			[Embed(source="assets/images/cross.png")] [Bindable] private var deleteIcon:Class;
+			[Embed(source="assets/images/customer_logo.gif")] [Bindable] private var lamsIcon:Class;
 			
 			private function onCreationComplete():void{	
 				// add a tooltooltip
@@ -70,10 +70,10 @@
 					event.stopImmediatePropagation();
 					
 					if(dictionary){
-						Alert.show(dictionary.getLabel("videorecorder.message.sure.delete"), dictionary.getLabel("videorecorder.confirm"), 3, this, confirmDeleteClick);  
+						Alert.show(dictionary.getLabel("videorecorder.message.sure.delete"), dictionary.getLabel("videorecorder.confirm"), 3, Sprite(Application.application), confirmDeleteClick);  
 					}
 					else{
-						Alert.show("videorecorder.message.sure.delete", "videorecorder.confirm", 3, this, confirmDeleteClick);  
+						Alert.show("videorecorder.message.sure.delete", "videorecorder.confirm", 3, Sprite(Application.application), confirmDeleteClick);  
 					}
 				}
 			}
Index: lams_flash/src/central/flex/VideoRecorder/src/VideoRecorder.mxml
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flex/VideoRecorder/src/VideoRecorder.mxml,v
diff -u -r1.4.2.1 -r1.4.2.2
--- lams_flash/src/central/flex/VideoRecorder/src/VideoRecorder.mxml	17 Apr 2009 08:21:52 -0000	1.4.2.1
+++ lams_flash/src/central/flex/VideoRecorder/src/VideoRecorder.mxml	19 May 2009 04:57:19 -0000	1.4.2.2
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml" layout="absolute" width="100%" backgroundGradientAlphas="[1.0, 1.0]" backgroundGradientColors="[#FFFFFF, #FFFFFF]" xmlns:ns1="org.lamsfoundation.lams.common.ui.components.*" xmlns:controls="com.asfusion.controls.*" height="100%" applicationComplete="onApplicationComplete(event)"  preinitialize="onPreinitialize(event)" enabled="true" xmlns:local="*" xmlns:ns2="org.lamsfoundation.lams.common.ui.components.*">
-	
+<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml" 
+	xmlns:commonComponents="org.lamsfoundation.lams.common.ui.components.*"
+	xmlns:controls="com.asfusion.controls.*"
+	xmlns:local="*"
+	layout="absolute" width="100%" height="100%" backgroundGradientAlphas="[1.0, 1.0]" backgroundGradientColors="[#FFFFFF, #FFFFFF]"
+	applicationComplete="onApplicationComplete(event)" 
+	preinitialize="onPreinitialize(event)">	
 	<mx:Script>
 		<![CDATA[
+			import mx.core.UIComponent;
+			import org.lamsfoundation.lams.common.util.ScreenShotterEvent;
 			//includes
 			include "HTTPServices.as"
 			
@@ -34,12 +41,13 @@
 			import mx.events.ListEvent;
 			import mx.managers.PopUpManager;
 			import org.lamsfoundation.lams.common.dictionary.XMLDictionary;
-			
+
 			// connection-related
 			private var nc:NetConnection;
 			private var client:Object;
 			private var cam:Camera = null;
 			private var mic:Microphone = null;
+			private var alertCount:uint = 0;
 			
 			// static strings
 			private static var red5App:String = "oflaDemo";
@@ -61,13 +69,14 @@
 			[Bindable] private var servletUrl:String;
 			[Bindable] private var languageXML:XML;
 			[Bindable] private var mode:String;
+			[Bindable] private var contentFolderUrl:String;
 
 			// misc
-			private var filename:String = "";
 			[Bindable] private var itemClicked:Object = null;
-			private var ratingClicked:Rating;
 			[Bindable] private var dictionary:XMLDictionary;
 			[Bindable] private var videoRecordings:XMLList = null;
+			private var filename:String = "";
+			private var ratingClicked:Rating;
 			private var playTimer:Timer;
 			private var recLabelTimer:Timer;
 			private var metadata:Object;
@@ -79,19 +88,25 @@
 			private var addCommentPopUp:AddCommentPopUp;			
 			
 			// icon embeds
-			[Embed(source="../../../../../../lams_central/web/images/icons/control_play.png")] [Bindable] private var playIcon:Class;
-			[Embed(source="../../../../../../lams_central/web/images/icons/control_pause.png")] [Bindable] private var pauseIcon:Class;
-			[Embed(source="../../../../../../lams_central/web/images/icons/control_record.png")] [Bindable] private var recordIcon:Class;
-			[Embed(source="../../../../../../lams_central/web/images/icons/comment_add.png")] [Bindable] private var addCommentIcon:Class;
-			[Embed(source="../../../../../../lams_central/web/images/icons/exclamation.png")] [Bindable] private var exclamationIcon:Class;
-			[Embed(source="../../../../../../lams_central/web/images/icons/webcam.png")] [Bindable] private var webcamIcon:Class;
-			[Embed(source="../../../../../../lams_central/web/images/icons/arrow_refresh_small.png")] [Bindable] private var refreshIcon:Class;
+			[Embed(source="assets/images/control_play.png")] [Bindable] private var playIcon:Class;
+			[Embed(source="assets/images/control_pause.png")] [Bindable] private var pauseIcon:Class;
+			[Embed(source="assets/images/control_record.png")] [Bindable] private var recordIcon:Class;
+			[Embed(source="assets/images/comment_add.png")] [Bindable] private var addCommentIcon:Class;
+			[Embed(source="assets/images/exclamation.png")] [Bindable] private var exclamationIcon:Class;
+			[Embed(source="assets/images/webcam.png")] [Bindable] private var webcamIcon:Class;
+			[Embed(source="assets/images/arrow_refresh_small.png")] [Bindable] private var refreshIcon:Class;
 			
 			// constants
 			public const TEACHER_MODE:String = "teacher";
 			public const AUTHOR_MODE:String = "author";
 			public const LEARNER_MODE:String = "learner";
-							
+			
+			// general alert listener for cam/mic alerts on startup
+			private function alertListener(event:CloseEvent):void {
+            	alertCount--;
+            	if(alertCount == 0 && nc == null) createConnection(); 
+            }
+					
 			// called from preinitialize
 			private function onPreinitialize(event:Event):void {
 				// get flashvars
@@ -121,27 +136,13 @@
 					serverUrl = "http://172.20.100.220:8080/lams/";
 					mode = AUTHOR_MODE;
 				}
-								
-				/*
-				Alert.show(
-					"contentEditable: " + contentEditable +
-					"\nuserId: " + userId +
-					"\ntoolSessionId: " + toolSessionId +
-					"\ntoolContentId: " + toolContentId +
-					"\nallowUseVoice: " + allowUseVoice +
-					"\nallowUseCamera: " + allowUseCamera +
-					"\nallowLearnerVideoVisibility: " + allowLearnerVideoVisibility +
-					"\nallowLearnerVideoExport: " + allowLearnerVideoExport +
-					"\nallowComments: " + allowComments +
-					"\nallowRatings: " + allowRatings +
-					"\nred5ServerUrl: " + red5ServerUrl +
-					"\nserverUrl: " + serverUrl +
-					"\nmode: " + mode);
-				*/
 			}
 			
 			// called from applicationComplete
 			private function onApplicationComplete(event:Event):void {
+				// show an overlay
+				LamsAjaxOverlayManager.showOverlay(UIComponent(Application.application));
+				
 				// init labels if languageXML is not empty
 				if(languageXML.toString() != ""){
 					dictionary = new XMLDictionary(languageXML);
@@ -169,38 +170,29 @@
 				videoDisplay.servletUrl = servletUrl;
 				
 				// if the cam is to be used, set that up
-				if(allowUseCamera){
-					cam = VideoDisplayUtil.setupCamera();
-					videoDisplay.attachCamera(cam);
-				}
-				// else remove the view camera button
-				else{
-					recordingButtonBox.removeChild(recordingButtonBox.getChildByName("viewCameraButton"));
-				}
+				cam = VideoDisplayUtil.setupCamera();
 				
 				// if the mic is to be used, set that up
-				if(allowUseVoice){
-					mic = VideoDisplayUtil.setupMic();
-					videoDisplay.attachMic(mic)
-				}
+				mic = VideoDisplayUtil.setupMic();
 				
-				// if neither mic or camera are to be used
-				if(!allowUseCamera && !allowUseVoice){
-					// remove recording button
-					removeChild(getChildByName("recordingBox"));
-					
-					// stretch the video list
-					videoList.setStyle("bottom", 10);
-					videoList.invalidateList();
-				}
-				else{
-					if(!isWebcamInfoSet())
-					{
-						Security.showSettings();
-						setWebcamInfo(true);
+				if(!checkCamera() || !checkMic()) {
+					if((!allowUseCamera && !allowUseVoice) || (!cam && !mic)) {
+						// remove recording button
+						removeChild(getChildByName("recordingBox"));
+						
+						// stretch the video list
+						videoList.setStyle("bottom", 10);
+						videoList.invalidateList();
 					}
 				}
 				
+				// if first time using video recorder, pop flash settings
+				if(!isWebcamInfoSet())
+				{
+					Security.showSettings();
+					setWebcamInfo(true);
+				}
+				
 				// init components that need it
 				videoInformation.init();
 				
@@ -216,10 +208,48 @@
 					startRecButton.enabled = false;
 				}
 				
-				// create the connection
-				createConnection();
+				// create the connection if no open alerts
+				if(alertCount <= 0)
+					createConnection();
 			}
 			
+			private function checkCamera():Boolean {
+				// if not allowed to record and no cam available or if just no cam available
+				if((!allowUseCamera && !cam) || !cam){
+					// remove view camera amd show an alert
+					recordingButtonBox.removeChild(recordingButtonBox.getChildByName("viewCameraButton"));	
+					
+					Alert.show(dictionary.getLabel("videorecorder.camera.not.available"), "", Alert.OK, Sprite(Application.application), alertListener);
+					alertCount++;
+					
+					return false;
+				}
+				// just not allowed to record
+				else if(!allowUseCamera){
+					recordingButtonBox.removeChild(recordingButtonBox.getChildByName("viewCameraButton"));	
+				} else {
+					videoDisplay.attachCamera(cam);
+				}
+				
+				return true;
+			}
+			
+			private function checkMic():Boolean {
+				if(allowUseVoice && mic){
+					videoDisplay.attachMic(mic);
+				}
+				// if no mic detected
+				else if(!mic){
+					// pop an alert
+					Alert.show(dictionary.getLabel("videorecorder.mic.not.available"), "", Alert.OK, Sprite(Application.application), alertListener);
+					alertCount++;
+					
+					return false;
+				}
+				
+				return true;
+			}
+			
 			// gets flashvars from request
 			private function getFlashVars():void{
 				red5ServerUrl = Application.application.parameters.red5ServerUrl;
@@ -236,6 +266,7 @@
 				allowRatings = LAMSStringUtil.stringToBool(Application.application.parameters.allowRatings);
 				languageXML = XML(Application.application.parameters.languageXML);
 				mode = Application.application.parameters.mode;
+				contentFolderUrl = Application.application.parameters.contentFolderUrl;
 			}
 			
 			// sets initial labels
@@ -314,6 +345,8 @@
 				videoDisplay.addEventListener(VideoDisplayEvent.READYSEEK, onReadySeek);
 				seekSlider.addEventListener(SliderEvent.THUMB_PRESS, onSeekPress);
 				seekSlider.addEventListener(SliderEvent.THUMB_RELEASE, onSeekRelease);
+				
+				this.addEventListener(ScreenShotterEvent.SCREENSHOTTAKEN, onScreenShotTaken);
 			}
 			
 			// checks for previous webcam info
@@ -361,31 +394,25 @@
 			private function ncStatusHandler(event:NetStatusEvent):void {
 				// get the info object
 				var infoObject:Object = event.info;
-				
-				// print its properties
-  				//DebugPopUp.getInstance().log(VideoDisplayUtil.printInfoObject(infoObject), DebugPopUp.DEBUG);
-  				
+				  				
 				// if successful connection
 				if (infoObject.code == "NetConnection.Connect.Success") {
 					// enable application
-					Application.application.enabled = true;
+					LamsAjaxOverlayManager.hideOverlay(UIComponent(Application.application));
 					
 					// call server and get recordings, update datagrid with results
 					getRecordingsFromServer(sortButtonGroup.sortBy, sortButtonGroup.sortDirection);	
 				}
 				// if connection unsuccessful
-				else if(infoObject.code == "NetConnection.Connect.InvalidApp"){
-					Application.application.enabled = false;			
+				else if(infoObject.code == "NetConnection.Connect.InvalidApp"){		
     				// pop an alert
 					Alert.show(dictionary.getLabel("videorecorder.web.application.not.available"));
 				}
-				else if(infoObject.code == "NetConnection.Connect.Failed"){
-					Application.application.enabled = false;				
+				else if(infoObject.code == "NetConnection.Connect.Failed"){			
     				// pop an alert
 					Alert.show(dictionary.getLabel("videorecorder.net.connection.not.connected"));
 				}
 				else if(infoObject.code == "NetConnection.Connect.Closed"){
-					Application.application.enabled = false;
     				// pop an alert
 					Alert.show(dictionary.getLabel("videorecorder.net.connection.closed"));
 				}
@@ -445,10 +472,7 @@
 			
 			// view camera click handler
 			private function viewCameraClick(event:MouseEvent):void{
-				if(!videoDisplay.isCameraViewed){
-					// reset the video display
-					videoDisplay.reset();
-					
+				if(!videoDisplay.isCameraViewed){					
 					// reset the seek slider timer
 					seekSlider.resetTimerLabel();
 					
@@ -520,7 +544,6 @@
 						videoInformation.enableVideoInformationButtons(false);
 					}
 					
-				
 					// scroll the video information box back up to top
 					videoInformation.verticalScrollPosition = 0;
 					
@@ -555,7 +578,7 @@
 						videoInformation.ratingButton.toolTip = dictionary.getLabelAndConcatenate("videorecorder.tooltip.already.rated", [" ", String(itemClicked.userRating)]);
 					}
 					
-					// make ready item clickedo
+					// make ready
 					makeReadytItemClicked();
 				}
 				else{
@@ -566,13 +589,25 @@
 			
 			// makes the clicked item ready with the video display
 			private function makeReadytItemClicked():void{
+				// correct filename if needed
+				var filename;
+				
+				// is local
+				var isLocal = LAMSStringUtil.stringToBool(itemClicked.isLocal);
+							
+				if(isLocal){
+					filename = contentFolderUrl + itemClicked.filename;
+				}else{
+					filename = itemClicked.filename;
+				}
+							
 				// if playing a sound file
 				if(LAMSStringUtil.stringToBool(itemClicked.isJustSound)){
 					// change the view stack to audio view
-					videoDisplay.makeReadyAudio(itemClicked.filename);
+					videoDisplay.makeReady(filename, "audio", isLocal);
 				}else{
 					// change the view stack to player view
-					videoDisplay.makeReadyVideo(itemClicked.filename);
+					videoDisplay.makeReady(filename, "video", isLocal);
 				}
 			}
 			
@@ -757,7 +792,15 @@
 				enablePlaybackButtons(false);
 				seekSlider.enable(false);
 			}
-									   	       	
+						
+			// onScreenShotTaken callback, called from screenShotter in videoDisplay
+			private function onScreenShotTaken(event:ScreenShotterEvent):void{
+				var previewImage:BitmapData = event.previewImage;
+			
+				// call the service
+				savePreviewImage(filename, "jpg", previewImage, toolSessionId);
+			}
+						   	       	
 	        // enables/disables the playback related buttons
 	        private function enablePlaybackButtons(enabled:Boolean):void{
 	        	var trueEnable:Boolean = enabled && itemClicked != null;
@@ -855,32 +898,32 @@
 	</mx:Script>
 
 	<mx:Panel width="340" height="310" layout="absolute" left="10" top="10" title="Display:" id="videoRecorderPanel" borderColor="#E2E2E2">
-	<ns1:VideoDisplay id="videoDisplay" width="320" height="240"/>
+	<commonComponents:VideoDisplay id="videoDisplay" width="320" height="240"/>
 	<mx:ControlBar height="38" y="242">
 		<mx:Button id="playButton" label="Play" width="75" textAlign="left" fontSize="10" paddingRight="0" paddingLeft="2"/>
-		<ns1:SeekSlider id="seekSlider" videoDisplay="{videoDisplay}" width="100%"/>
+		<commonComponents:SeekSlider id="seekSlider" videoDisplay="{videoDisplay}" width="100%"/>
 	</mx:ControlBar>
 	</mx:Panel>
 	<mx:Label id="videoInformationLabel" text="Video information:" fontWeight="bold" top="328" left="10"/>
-	<local:VideoInformation id="videoInformation" allowComments="{allowComments}" allowRatings="{allowRatings}" dictionary="{dictionary}" backgroundDisabledColor="#FFFFFF" cornerRadius="5" bottom="10" top="354" left="10" width="340"/>
+	<local:VideoInformation id="videoInformation" allowComments="{allowComments}" allowRatings="{allowRatings}" dictionary="{dictionary}" backgroundDisabledColor="#FFFFFF" cornerRadius="5" bottom="10" top="354" left="10" width="340" horizontalScrollPolicy="off" verticalScrollPolicy="on"/>
 	<mx:HBox left="358" top="10" right="10">
 		<mx:Label id="videosLabel" text="Videos:" fontWeight="bold"/>
 	</mx:HBox>
-	<mx:TileList borderStyle="solid" id="videoList" itemRenderer="{new ArgumentsToRendererFactory({userId:this.userId, allowLearnerVideoExport:this.allowLearnerVideoExport, allowLearnerVideoVisibility:this.allowLearnerVideoVisibility, mode:this.mode, dictionary:this.dictionary, contentEditable: this.contentEditable},VideoProfile)}" dataProvider="{videoRecordings}" paddingLeft="0" paddingRight="0" paddingTop="0" paddingBottom="0" itemClick="videoListClick(event)" top="62" left="358" bottom="70" cornerRadius="5" right="10"></mx:TileList>
+	<mx:TileList borderStyle="solid" id="videoList" itemRenderer="{new ArgumentsToRendererFactory({userId:this.userId, allowLearnerVideoExport:this.allowLearnerVideoExport, allowLearnerVideoVisibility:this.allowLearnerVideoVisibility, mode:this.mode, dictionary:this.dictionary, contentEditable: this.contentEditable},VideoProfile)}" dataProvider="{videoRecordings}" paddingLeft="0" paddingRight="0" paddingTop="0" paddingBottom="0" itemClick="videoListClick(event)" top="62" left="358" bottom="63" cornerRadius="5" right="10"></mx:TileList>
 	<mx:HBox verticalAlign="middle" left="358" top="36" right="10">
 		<mx:Label id="sortByLabel" text="Sort by:" fontWeight="normal" fontStyle="normal"/>
-		<ns2:SortButtonGroup width="100%" horizontalGap="3" id="sortButtonGroup">
-			<ns2:SortButton id="sortDateButton" label="Date"  sortBy="date" selected="true" horizontalGap="0" sortDirection="descending"/>
-			<ns2:SortButton id="sortAuthorButton" label="Author"  sortBy="author" horizontalGap="0"/>
-			<ns2:SortButton id="sortTitleButton" label="Title"  sortBy="title" horizontalGap="0"/>
-		</ns2:SortButtonGroup>
+		<commonComponents:SortButtonGroup width="100%" horizontalGap="3" id="sortButtonGroup">
+			<commonComponents:SortButton id="sortDateButton" label="Date"  sortBy="date" selected="true" horizontalGap="0" sortDirection="descending"/>
+			<commonComponents:SortButton id="sortAuthorButton" label="Author"  sortBy="author" horizontalGap="0"/>
+			<commonComponents:SortButton id="sortTitleButton" label="Title"  sortBy="title" horizontalGap="0"/>
+		</commonComponents:SortButtonGroup>
 		<mx:Button label="Update" id="refreshButton" click="getRecordingsFromServer(sortButtonGroup.sortBy, sortButtonGroup.sortDirection)" height="17" textAlign="center"/>
 	</mx:HBox>
-	<mx:VBox height="52" horizontalAlign="right" right="10" bottom="10" left="357" id="recordingBox">
+	<mx:VBox horizontalAlign="right" right="10" bottom="10" left="357" id="recordingBox" verticalGap="5">
 		<mx:Label id="recordingControlsLabel" text="Recording controls:" fontWeight="bold"/>
-		<mx:HBox width="100%" height="100%" horizontalAlign="right"  id="recordingButtonBox">
+		<mx:HBox width="100%" horizontalAlign="right"  id="recordingButtonBox">
 			<mx:Button id="viewCameraButton" label="View Camera"/>
 			<mx:Button fontWeight="bold" id="startRecButton" label="Start Recording"/>
 		</mx:HBox>
 	</mx:VBox>
-</mx:Application>
+</mx:Application>
\ No newline at end of file
Index: lams_flash/src/central/flex/VideoRecorder/src/assets/images/arrow_refresh_small.png
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flex/VideoRecorder/src/assets/images/arrow_refresh_small.png,v
diff -u -r1.1.2.1 -r1.1.2.2
Binary files differ
Index: lams_flash/src/central/flex/VideoRecorder/src/assets/images/comment_add.png
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flex/VideoRecorder/src/assets/images/comment_add.png,v
diff -u -r1.1.2.1 -r1.1.2.2
Binary files differ
Index: lams_flash/src/central/flex/VideoRecorder/src/assets/images/control_pause.png
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flex/VideoRecorder/src/assets/images/control_pause.png,v
diff -u -r1.1.2.1 -r1.1.2.2
Binary files differ
Index: lams_flash/src/central/flex/VideoRecorder/src/assets/images/control_play.png
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flex/VideoRecorder/src/assets/images/control_play.png,v
diff -u -r1.1.2.1 -r1.1.2.2
Binary files differ
Index: lams_flash/src/central/flex/VideoRecorder/src/assets/images/control_record.png
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flex/VideoRecorder/src/assets/images/control_record.png,v
diff -u -r1.1.2.1 -r1.1.2.2
Binary files differ
Index: lams_flash/src/central/flex/VideoRecorder/src/assets/images/cross.png
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flex/VideoRecorder/src/assets/images/cross.png,v
diff -u -r1.1.2.1 -r1.1.2.2
Binary files differ
Index: lams_flash/src/central/flex/VideoRecorder/src/assets/images/customer_logo.gif
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flex/VideoRecorder/src/assets/images/customer_logo.gif,v
diff -u -r1.1.2.1 -r1.1.2.2
Binary files differ
Index: lams_flash/src/central/flex/VideoRecorder/src/assets/images/date.png
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flex/VideoRecorder/src/assets/images/date.png,v
diff -u -r1.1.2.1 -r1.1.2.2
Binary files differ
Index: lams_flash/src/central/flex/VideoRecorder/src/assets/images/exclamation.png
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flex/VideoRecorder/src/assets/images/exclamation.png,v
diff -u -r1.1.2.1 -r1.1.2.2
Binary files differ
Index: lams_flash/src/central/flex/VideoRecorder/src/assets/images/note.png
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flex/VideoRecorder/src/assets/images/note.png,v
diff -u -r1.1.2.1 -r1.1.2.2
Binary files differ
Index: lams_flash/src/central/flex/VideoRecorder/src/assets/images/pencil.png
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flex/VideoRecorder/src/assets/images/pencil.png,v
diff -u -r1.1.2.1 -r1.1.2.2
Binary files differ
Index: lams_flash/src/central/flex/VideoRecorder/src/assets/images/user.png
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flex/VideoRecorder/src/assets/images/user.png,v
diff -u -r1.1.2.1 -r1.1.2.2
Binary files differ
Index: lams_flash/src/central/flex/VideoRecorder/src/assets/images/webcam.png
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flex/VideoRecorder/src/assets/images/webcam.png,v
diff -u -r1.1.2.1 -r1.1.2.2
Binary files differ
Index: lams_flash/src/central/flex/VideoRecorderFCKEditor/src/HTTPServices.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flex/VideoRecorderFCKEditor/src/HTTPServices.as,v
diff -u -r1.1 -r1.1.2.1
Binary files differ
Index: lams_flash/src/central/flex/VideoRecorderFCKEditor/src/VideoRecorderFCKEditor.mxml
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flex/VideoRecorderFCKEditor/src/VideoRecorderFCKEditor.mxml,v
diff -u -r1.3.2.1 -r1.3.2.2
--- lams_flash/src/central/flex/VideoRecorderFCKEditor/src/VideoRecorderFCKEditor.mxml	17 Apr 2009 08:21:52 -0000	1.3.2.1
+++ lams_flash/src/central/flex/VideoRecorderFCKEditor/src/VideoRecorderFCKEditor.mxml	19 May 2009 04:57:19 -0000	1.3.2.2
@@ -1,9 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml" layout="absolute" xmlns:ns1="org.lamsfoundation.lams.common.ui.components.*" backgroundGradientAlphas="[1.0, 1.0]" backgroundGradientColors="[#FFFFFF, #FFFFFF]" width="361" height="331" preinitialize="onPreinitialize(event)" applicationComplete="onApplicationComplete(event)" xmlns:ns2="*">
-
+<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml"
+	xmlns:ns1="org.lamsfoundation.lams.common.ui.components.*"
+	xmlns:ns2="*"
+	layout="absolute" 	backgroundGradientAlphas="[1.0, 1.0]" backgroundGradientColors="[#FFFFFF, #FFFFFF]" width="361" height="331"
+	enabled="false"
+	preinitialize="onPreinitialize(event)"
+	applicationComplete="onApplicationComplete(event)">
+		
 	<mx:Script>
 		<![CDATA[
-			
+			import mx.events.CloseEvent;
+			import mx.core.UIComponent;
+			import org.lamsfoundation.lams.common.managers.LamsAjaxOverlayManager;
+			import org.lamsfoundation.lams.common.conn.ImageService;
+			import org.lamsfoundation.lams.common.util.ScreenShotterEvent;
+						
 			//includes
 			include "HTTPServices.as"
 			
@@ -26,6 +37,7 @@
 			
 			// flashvars
 			[Bindable] private var mode:String;
+			private var offlinePlayback:Boolean;
 			private var red5ServerUrl:String;
 			private var red5RecordingsUrl:String;
 			private var saveToLamsDestUrl:String;
@@ -48,17 +60,20 @@
 			private var mic:Microphone;
 			private var languageTimer:Timer;
 			private var getDetailsPopUp:GetRecordingDetailsPopUp;
+			private var alertCount:uint = 0;
 			
 			// static strings
 			private static var red5App:String = "oflaDemo";
-			private static var toolServletLocation:String = "tool/lavidr10/videoRecorderActions.do";
+			private static var toolWWWDir:String = "tool/lavidr10/";
+			private static var toolServletLocation:String = "videoRecorderActions.do";
 			private static var saveToLamsServletLocation:String = "GetRecording";
+			private static var flvExtension:String = ".flv";
 			
 			// icon embeds
-			[Embed(source="../../../../../../lams_central/web/images/icons/control_play.png")] [Bindable] private var playIcon:Class;
-			[Embed(source="../../../../../../lams_central/web/images/icons/control_pause.png")] [Bindable] private var pauseIcon:Class;
-			[Embed(source="../../../../../../lams_central/web/images/icons/control_record.png")] [Bindable] private var recordIcon:Class;
-			[Embed(source="../../../../../../lams_central/web/images/icons/accept.png")] [Bindable] private var saveIcon:Class;
+			[Embed(source="assets/images/control_play.png")] [Bindable] private var playIcon:Class;
+			[Embed(source="assets/images/control_pause.png")] [Bindable] private var pauseIcon:Class;
+			[Embed(source="assets/images/control_record.png")] [Bindable] private var recordIcon:Class;
+			[Embed(source="assets/images/accept.png")] [Bindable] private var saveIcon:Class;
 			
 			// called first of all, before any components are initialized
 			private function onPreinitialize(event:Event):void{
@@ -86,8 +101,15 @@
 				videoDisplayPanel.addChild(videoControlBar);
 			}
 			
+			// general alert listener for cam/mic alerts on startup
+			private function alertListener(event:CloseEvent):void {
+            	alertCount--;
+            	if(alertCount == 0 && nc == null) createConnection(); 
+            }
+			
 			// called after everything is created and ready to go
 			private function onApplicationComplete(event:Event):void {
+				LamsAjaxOverlayManager.showOverlay(UIComponent(Application.application));
 				// add an external interface callback to all setLanguageXML to be called from js
 				ExternalInterface.addCallback("setLanguageXML", setLanguageXML);					
 				
@@ -118,7 +140,7 @@
 				red5ServerUrl += red5App;
 				
 				// add the tool servlet location
-				toolServletUrl = serverUrl + toolServletLocation;
+				toolServletUrl = serverUrl + toolWWWDir + toolServletLocation;
 				
 				// add the save to lams servlet location
 				saveToLamsServletUrl = serverUrl + saveToLamsServletLocation;
@@ -129,18 +151,27 @@
 								
 				// swtich on mode
 				switch(mode){
+					/*
+					In playerModeOnline mode, the parameters passed via flashVars are used to create a connection to a given Red5 server.
+					Video is streamed from that server to the user.
+					*/
 					case "playerModeOnline":{
 						createConnection();
 						break;
 					}
-
+					/*
+					In playerModeOffline mode, a null NetConnection object is used to play local video from the disk.
+					*/
 					case "playerModeOffline":{
-						var nc:NetConnection = new NetConnection();
-						nc.connect(null);
-						videoDisplay.setNetConnection(nc);
-						videoDisplay.makeReadyVideo(filename);
+						LamsAjaxOverlayManager.hideOverlay(UIComponent(Application.application));
+						videoDisplay.makeReady(filename, "video", true);
 						break;
 					}
+					/*
+					In recorderModeFCK mode, a NetConnection is created to the given Red5 server. Video is streamed and recorded
+					on this server. It is then copied back to the LAMS server in the lesson's content folder for local reading
+					much like an attachment is added to the FCKEditor.
+					*/
 					case "recorderModeFCK":{
 						toolContentId = -1;
 						
@@ -150,13 +181,28 @@
 							setWebcamInfo(true);
 						}
 						
+						// set up camera
 						cam = VideoDisplayUtil.setupCamera();
+
+						// set up mic
 						mic = VideoDisplayUtil.setupMic();
-						videoDisplay.attachCamera(cam);
-						videoDisplay.attachMic(mic);
-						createConnection();
+						
+						if(!checkCamera() && !checkMic()) {
+							// don't allow recording if neither cam nor mic is enabled
+							if(!mic && !cam){
+								videoControlBar.recordButton.enabled = false;
+							}
+						}
+						
+						if(alertCount <= 0) createConnection();
+						
 						break;
 					}
+					/*
+					In recorderModeAuthor mode, a NetConnection is created to the given Red5 server. Video is streamed and recorded
+					on this server. It is then used in a VideoRecorder tool session. After it is recorded, it is immediately transfered back to
+					the LAMS server in case the lesson is exported.
+					*/
 					case "recorderModeAuthor":{
 						userId = -1;
 						
@@ -166,16 +212,51 @@
 							setWebcamInfo(true);
 						}
 						
+						// set up camera
 						cam = VideoDisplayUtil.setupCamera();
+						
+						// set up mic
 						mic = VideoDisplayUtil.setupMic();
-						videoDisplay.attachCamera(cam);
-						videoDisplay.attachMic(mic);
-						createConnection();
+						
+						if(!checkCamera() && !checkMic()) {
+							// don't allow recording if neither cam nor mic is enabled
+							if(!mic && !cam){
+								videoControlBar.recordButton.enabled = false;
+							}
+						}
+						
+						if(alertCount <= 0) createConnection();
 
 						break;
 					}
 				}
 			}
+			
+			private function checkCamera():Boolean {
+				if(cam){
+					videoDisplay.attachCamera(cam);
+				}
+				else{
+					Alert.show(dictionary.getLabel("videorecorder.camera.not.available"), "", Alert.OK, Sprite(Application.application), alertListener);
+					alertCount++;
+					return false;
+				}
+				
+				return true;	
+			}
+			
+			private function checkMic():Boolean {
+				if(mic){
+					videoDisplay.attachMic(mic);
+				}
+				else{
+					Alert.show(dictionary.getLabel("videorecorder.mic.not.available"), "", Alert.OK, Sprite(Application.application), alertListener);
+					alertCount++;
+					return false;
+				}
+				
+				return true;
+			}
 						
 			// sets language xml, usually called at a later time through javascript
 			public function setLanguageXML(languageXMLString:String):void{
@@ -204,6 +285,7 @@
 				videoDisplay.addEventListener(VideoDisplayEvent.STOPPUBLISH, onStopPublish);
 				videoDisplay.addEventListener(VideoDisplayEvent.PAUSESEEK, onPauseSeek);
 				videoDisplay.addEventListener(VideoDisplayEvent.READYSEEK, onReadySeek);	
+				this.addEventListener(ScreenShotterEvent.SCREENSHOTTAKEN, onScreenShotTaken);
 				
 				videoControlBar.playButton.addEventListener(MouseEvent.CLICK, playClick);
 				
@@ -269,11 +351,12 @@
 			
 			// gets flashvars
 			private function getFlashVars():void{
+				mode = Application.application.parameters.mode;
+				offlinePlayback = LAMSStringUtil.stringToBool(Application.application.parameters.offlinePlayback);
 				red5ServerUrl = Application.application.parameters.red5ServerUrl;
 				serverUrl = Application.application.parameters.serverUrl;
 				filename = Application.application.parameters.filename;
 				languageXML = XML(Application.application.parameters.languageXML);
-				mode = Application.application.parameters.mode;
 				toolContentId = Application.application.parameters.toolContentId;
 				userId = Application.application.parameters.userId;
 				red5RecordingsUrl = Application.application.parameters.red5RecordingsUrl;
@@ -327,39 +410,46 @@
 				// if successful connection
 				if (infoObject.code == "NetConnection.Connect.Success") {
 					// enable application
-					Application.application.enabled = true;
+					LamsAjaxOverlayManager.hideOverlay(UIComponent(Application.application));
 					
-					// if we are in a player instance
-					if(mode == "playerModeOffline" || mode == "playerModeOnline"){
-						videoDisplay.makeReadyVideo(filename);
+					// if we are in a player online instance
+					if(mode == "playerModeOnline"){
+						// extension added from fck record
+						videoDisplay.makeReady(filename, "video", false);
 					}
-					// if we are in fck mode or if we are in recorder mode AND have no input filename
-					else if(mode == "recorderModeFCK" || (mode == "recorderModeAuthor" && filename == "")){
+					// if we are in fck mode
+					else if(mode == "recorderModeFCK"){
 						videoDisplay.startViewCamera();
 					}
+					// if we are in recorder mode and have no input filename
+					else if(mode == "recorderModeAuthor" && filename == flvExtension){
+						videoDisplay.startViewCamera();
+					}
 					// if we are in author mode and are given a filename, don't start camera, play recording instead
-					else if(mode == "recorderModeAuthor" && filename != ""){					
+					else if(mode == "recorderModeAuthor" && filename != flvExtension){
+						// add on to the filename if offlinePlayback is active
+						if(offlinePlayback){
+							filename = contentFolderUrl + filename;
+						}
+						
 						// change the start recording button's label
-						videoDisplay.makeReadyVideo(filename);
+						videoDisplay.makeReady(filename, "video", offlinePlayback);
 						
 						// update tooltip
 						videoControlBar.recordButton.toolTip = dictionary.getLabel("videorecorder.tooltip.start.recording.again");
 					}
 
 				}
 				// if connection unsuccessful
-				else if(infoObject.code == "NetConnection.Connect.InvalidApp"){
-					Application.application.enabled = false;			
+				else if(infoObject.code == "NetConnection.Connect.InvalidApp"){		
 					// pop an alert
 					Alert.show("Web appplication not available");
 				}
 				else if(infoObject.code == "NetConnection.Connect.Failed"){
-					Application.application.enabled = false;				
 					// pop an alert
 					Alert.show("NetConnection not connected");
 				}
 				else if(infoObject.code == "NetConnection.Connect.Closed"){
-					Application.application.enabled = false;
 					// pop an alert
 					Alert.show("NetConnection closed");
 				}
@@ -494,12 +584,15 @@
 			
 			// onStopPublish callback, called from videoDisplay
 			private function onStopPublish(event:VideoDisplayEvent):void{
-				if(mode == "recorderModeFCK"){
+				// no matter what, the video just recorded is now on the server
+				offlinePlayback = false;
+				
+				if(mode == "recorderModeFCK"){											
 					// alert complete
 					Alert.show(dictionary.getLabel("videorecorder.recording.complete.fck"));
 					
-					// change the start recording button's label
-					videoDisplay.makeReadyVideo(filename);
+					// play the movie from the Red5 server
+					videoDisplay.makeReady(filename, "video", offlinePlayback);
 					
 					// change the panel status
 					videoDisplayPanel.status = dictionary.getLabel("videorecorder.ready");
@@ -510,18 +603,18 @@
 					// enable saving and closing
 					videoControlBar.saveAndCloseButton.enabled = true;
 					videoControlBar.saveAndCloseButton.toolTip = dictionary.getLabel("videorecorder.tooltip.save.recording");
-					
-					// copy recording to lams server
-					copyRecordingToLamsServer(red5RecordingsUrl + filename + ".flv", lamsEarDir + saveToLamsDestUrl, filename + ".flv");
 				}
-				else if(mode == "recorderModeAuthor"){
+				else if(mode == "recorderModeAuthor"){							
 					// get the details needed
 					getDetailsPopUp = GetRecordingDetailsPopUp(PopUpManager.createPopUp(this, GetRecordingDetailsPopUp, true));
 					PopUpManager.centerPopUp(getDetailsPopUp);
 					getDetailsPopUp.init(dictionary);
 					getDetailsPopUp.addEventListener("popUpClose", popUpRemovedHandler);
 				}
 				
+				// copy recording to lams server
+				copyRecordingToLamsServer(red5RecordingsUrl + filename + ".flv", lamsEarDir + saveToLamsDestUrl, filename + ".flv");
+					
 				recTimer.stop();
 			}
 						
@@ -551,7 +644,18 @@
 				videoControlBar.seekSlider.enable(true);
 				videoDisplayPanel.status = dictionary.getLabel("videorecorder.ready");
 			}
-	
+			
+			// onScreenShotTaken callback, called from screenShotter in videoDisplay
+			private function onScreenShotTaken(event:ScreenShotterEvent):void{
+				// only save screenshot if in author mode
+				if(mode == "recorderModeAuthor"){
+					// get the preview image
+					var previewImage:BitmapData = event.previewImage;
+					
+					// call the service
+					savePreviewImage(lamsEarDir + saveToLamsDestUrl, filename, "jpg", previewImage);
+				}
+			}
 		]]>
 	</mx:Script>
 	<mx:Panel x="10" y="10" width="340" height="310" layout="absolute" id="videoDisplayPanel">
Index: lams_flash/src/central/flex/VideoRecorderFCKEditor/src/assets/images/accept.png
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flex/VideoRecorderFCKEditor/src/assets/images/accept.png,v
diff -u -r1.1.2.1 -r1.1.2.2
Binary files differ
Index: lams_flash/src/central/flex/VideoRecorderFCKEditor/src/assets/images/control_pause.png
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flex/VideoRecorderFCKEditor/src/assets/images/control_pause.png,v
diff -u -r1.1.2.1 -r1.1.2.2
Binary files differ
Index: lams_flash/src/central/flex/VideoRecorderFCKEditor/src/assets/images/control_play.png
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flex/VideoRecorderFCKEditor/src/assets/images/control_play.png,v
diff -u -r1.1.2.1 -r1.1.2.2
Binary files differ
Index: lams_flash/src/central/flex/VideoRecorderFCKEditor/src/assets/images/control_record.png
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flex/VideoRecorderFCKEditor/src/assets/images/control_record.png,v
diff -u -r1.1.2.1 -r1.1.2.2
Binary files differ