Index: lams_build/lib/lams/lams-central.jar
===================================================================
diff -u -r00a6e145b37916eb1561ea5c68319b0fc691681b -r42aa5319fbd33938828764c43dd0ab1ca80e2416
Binary files differ
Index: lams_build/lib/lams/lams-learning.jar
===================================================================
diff -u -r8386a3fecd9c7baf6ed69d499016dedd8a83eac6 -r42aa5319fbd33938828764c43dd0ab1ca80e2416
Binary files differ
Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -r00a6e145b37916eb1561ea5c68319b0fc691681b -r42aa5319fbd33938828764c43dd0ab1ca80e2416
Binary files differ
Index: lams_central/src/java/org/lamsfoundation/lams/util/ExternalServerUtil.java
===================================================================
diff -u
--- lams_central/src/java/org/lamsfoundation/lams/util/ExternalServerUtil.java	(revision 0)
+++ lams_central/src/java/org/lamsfoundation/lams/util/ExternalServerUtil.java	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
@@ -0,0 +1,88 @@
+package org.lamsfoundation.lams.util;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URLConnection;
+import java.util.HashMap;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.Map.Entry;
+
+import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.tool.exception.ToolException;
+import org.lamsfoundation.lams.util.Configuration;
+import org.lamsfoundation.lams.util.ConfigurationKeys;
+
+public class ExternalServerUtil {
+	
+	private static Logger logger = Logger.getLogger(ExternalServerUtil.class);
+	
+    public static InputStream getResponseInputStreamFromExternalServer(String urlStr, HashMap<String, String> params)
+    throws IOException {
+		if (!urlStr.endsWith("?"))
+		    urlStr += "?";
+		
+		for (Entry<String, String> entry : params.entrySet()) {
+		    urlStr += "&" + entry.getKey() + "=" + entry.getValue();
+		}
+		
+		logger.debug("Making request to external servlet: " + urlStr);
+		
+		URL url = new URL(urlStr);
+		URLConnection conn = url.openConnection();
+		if (!(conn instanceof HttpURLConnection)) {
+		    logger.error("Fail to connect to external server though url:  " + urlStr);
+		    throw new ToolException("Fail to connect to external server though url:  " + urlStr);
+		}
+		
+		HttpURLConnection httpConn = (HttpURLConnection) conn;
+		if (httpConn.getResponseCode() != HttpURLConnection.HTTP_OK) {
+		    logger.error("Fail to fetch data from external server, response code:  " + httpConn.getResponseCode()
+			    + " Url: " + urlStr);
+		    throw new ToolException("Fail to fetch data from external server, response code:  "
+			    + httpConn.getResponseCode() + " Url: " + urlStr);
+		}
+		
+		InputStream is = url.openConnection().getInputStream();
+		if (is == null) {
+		    logger.error("Fail to fetch data from external server, return InputStream null:  " + urlStr);
+		    throw new ToolException("Fail to fetch data from external server, return inputStream null:  " + urlStr);
+		}
+		
+		return is;
+	}
+    
+    public static File writeFileAndDir(InputStream is, String filename, String dir){
+    	File file = null;
+    	file = new File(dir);
+    	file.mkdirs();
+    	return writeFile(is, dir + filename);
+    }
+    
+    public static File writeFile(InputStream is, String filename){
+    	File file = null;
+    	
+    	try{
+    		file = new File(filename);
+    		
+            FileOutputStream out = new FileOutputStream(file);
+      
+            //int maxMem = Integer.getInteger(Configuration.get(ConfigurationKeys.UPLOAD_FILE_MAX_MEMORY_SIZE))
+            
+            byte[] buf = new byte[2 * 1024];
+            int len;
+            while ((len = is.read(buf)) > 0) {
+            	out.write(buf, 0, len);
+            }    
+    	}catch(FileNotFoundException e){
+    		logger.error("File not found:  " + e.getMessage());
+    	}catch(Exception e){
+    		logger.error("Fail to create file:  " + e.getMessage());
+    	}
+    	
+        return file;
+    }
+}
Index: lams_central/src/java/org/lamsfoundation/lams/webservice/GetRecordingServlet.java
===================================================================
diff -u
--- lams_central/src/java/org/lamsfoundation/lams/webservice/GetRecordingServlet.java	(revision 0)
+++ lams_central/src/java/org/lamsfoundation/lams/webservice/GetRecordingServlet.java	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
@@ -0,0 +1,74 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */ 
+ 
+/* $Id$ */ 
+package org.lamsfoundation.lams.webservice; 
+
+import java.io.File;
+import java.io.InputStream;
+import java.util.HashMap;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.util.ExternalServerUtil;
+import org.lamsfoundation.lams.util.WebUtil;
+ 
+/**
+ * @author pgeorges
+ *
+ * @web:servlet name="GetRecordingServlet"
+ * @web:servlet-mapping url-pattern="/GetRecording"
+ */
+public class GetRecordingServlet extends HttpServlet {
+	
+	private static Logger logger = Logger.getLogger(GetRecordingServlet.class);
+	
+	public void doPost(HttpServletRequest request, HttpServletResponse response) 
+		throws ServletException {
+
+		try {
+			String urlStr = WebUtil.readStrParam(request, "urlStr");
+			//HashMap<String, String> params = (HashMap<String, String>)request.getAttribute("params");
+			String filename = WebUtil.readStrParam(request, "filename");
+			String dir = WebUtil.readStrParam(request, "dir");
+			
+			InputStream is = ExternalServerUtil.getResponseInputStreamFromExternalServer(urlStr, new HashMap<String,String>());
+			File file = ExternalServerUtil.writeFileAndDir(is, filename, dir);
+			
+			logger.debug("file copy complete");
+			
+		} catch (Exception e) {
+			logger.error(e.getMessage());
+		}		
+	}
+	
+	public void doGet(HttpServletRequest request, HttpServletResponse response) 
+	throws ServletException {
+		doPost(request, response);
+	}
+
+}
+ 
\ No newline at end of file
Index: lams_central/web/WEB-INF/tags/FCKEditor.tag
===================================================================
diff -u -r0e08d909e2d4b297606e51141e82d86b50393003 -r42aa5319fbd33938828764c43dd0ab1ca80e2416
--- lams_central/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision 0e08d909e2d4b297606e51141e82d86b50393003)
+++ lams_central/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
@@ -65,6 +65,7 @@
 	LinkUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/"
 	FlashBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
 	FlashUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/"
+	ContentFolderID="${contentFolderID}"
 	AutoDetectLanguage="false"
 	DefaultLanguage="${language}"
 	ToolbarStartExpanded="${displayExpanded}"/>
Index: lams_central/web/fckeditor/editor/plugins/videorecorder/AC_OETags.js
===================================================================
diff -u
--- lams_central/web/fckeditor/editor/plugins/videorecorder/AC_OETags.js	(revision 0)
+++ lams_central/web/fckeditor/editor/plugins/videorecorder/AC_OETags.js	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
@@ -0,0 +1,278 @@
+// Flash Player Version Detection - Rev 1.6
+// Detect Client Browser type
+// Copyright(c) 2005-2006 Adobe Macromedia Software, LLC. All rights reserved.
+var isIE  = (navigator.appVersion.indexOf("MSIE") != -1) ? true : false;
+var isWin = (navigator.appVersion.toLowerCase().indexOf("win") != -1) ? true : false;
+var isOpera = (navigator.userAgent.indexOf("Opera") != -1) ? true : false;
+
+function ControlVersion()
+{
+	var version;
+	var axo;
+	var e;
+
+	// NOTE : new ActiveXObject(strFoo) throws an exception if strFoo isn't in the registry
+
+	try {
+		// version will be set for 7.X or greater players
+		axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.7");
+		version = axo.GetVariable("$version");
+	} catch (e) {
+	}
+
+	if (!version)
+	{
+		try {
+			// version will be set for 6.X players only
+			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.6");
+			
+			// installed player is some revision of 6.0
+			// GetVariable("$version") crashes for versions 6.0.22 through 6.0.29,
+			// so we have to be careful. 
+			
+			// default to the first public version
+			version = "WIN 6,0,21,0";
+
+			// throws if AllowScripAccess does not exist (introduced in 6.0r47)		
+			axo.AllowScriptAccess = "always";
+
+			// safe to call for 6.0r47 or greater
+			version = axo.GetVariable("$version");
+
+		} catch (e) {
+		}
+	}
+
+	if (!version)
+	{
+		try {
+			// version will be set for 4.X or 5.X player
+			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.3");
+			version = axo.GetVariable("$version");
+		} catch (e) {
+		}
+	}
+
+	if (!version)
+	{
+		try {
+			// version will be set for 3.X player
+			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.3");
+			version = "WIN 3,0,18,0";
+		} catch (e) {
+		}
+	}
+
+	if (!version)
+	{
+		try {
+			// version will be set for 2.X player
+			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash");
+			version = "WIN 2,0,0,11";
+		} catch (e) {
+			version = -1;
+		}
+	}
+	
+	return version;
+}
+
+// JavaScript helper required to detect Flash Player PlugIn version information
+function GetSwfVer(){
+	// NS/Opera version >= 3 check for Flash plugin in plugin array
+	var flashVer = -1;
+	
+	if (navigator.plugins != null && navigator.plugins.length > 0) {
+		if (navigator.plugins["Shockwave Flash 2.0"] || navigator.plugins["Shockwave Flash"]) {
+			var swVer2 = navigator.plugins["Shockwave Flash 2.0"] ? " 2.0" : "";
+			var flashDescription = navigator.plugins["Shockwave Flash" + swVer2].description;
+			var descArray = flashDescription.split(" ");
+			var tempArrayMajor = descArray[2].split(".");			
+			var versionMajor = tempArrayMajor[0];
+			var versionMinor = tempArrayMajor[1];
+			var versionRevision = descArray[3];
+			if (versionRevision == "") {
+				versionRevision = descArray[4];
+			}
+			if (versionRevision[0] == "d") {
+				versionRevision = versionRevision.substring(1);
+			} else if (versionRevision[0] == "r") {
+				versionRevision = versionRevision.substring(1);
+				if (versionRevision.indexOf("d") > 0) {
+					versionRevision = versionRevision.substring(0, versionRevision.indexOf("d"));
+				}
+			} else if (versionRevision[0] == "b") {
+				versionRevision = versionRevision.substring(1);
+			}
+			var flashVer = versionMajor + "." + versionMinor + "." + versionRevision;
+		}
+	}
+	// MSN/WebTV 2.6 supports Flash 4
+	else if (navigator.userAgent.toLowerCase().indexOf("webtv/2.6") != -1) flashVer = 4;
+	// WebTV 2.5 supports Flash 3
+	else if (navigator.userAgent.toLowerCase().indexOf("webtv/2.5") != -1) flashVer = 3;
+	// older WebTV supports Flash 2
+	else if (navigator.userAgent.toLowerCase().indexOf("webtv") != -1) flashVer = 2;
+	else if ( isIE && isWin && !isOpera ) {
+		flashVer = ControlVersion();
+	}
+	return flashVer;
+}
+
+// When called with reqMajorVer, reqMinorVer, reqRevision returns true if that version or greater is available
+function DetectFlashVer(reqMajorVer, reqMinorVer, reqRevision)
+{
+	versionStr = GetSwfVer();
+	if (versionStr == -1 ) {
+		return false;
+	} else if (versionStr != 0) {
+		if(isIE && isWin && !isOpera) {
+			// Given "WIN 2,0,0,11"
+			tempArray         = versionStr.split(" "); 	// ["WIN", "2,0,0,11"]
+			tempString        = tempArray[1];			// "2,0,0,11"
+			versionArray      = tempString.split(",");	// ['2', '0', '0', '11']
+		} else {
+			versionArray      = versionStr.split(".");
+		}
+		var versionMajor      = versionArray[0];
+		var versionMinor      = versionArray[1];
+		var versionRevision   = versionArray[2];
+
+        	// is the major.revision >= requested major.revision AND the minor version >= requested minor
+		if (versionMajor > parseFloat(reqMajorVer)) {
+			return true;
+		} else if (versionMajor == parseFloat(reqMajorVer)) {
+			if (versionMinor > parseFloat(reqMinorVer))
+				return true;
+			else if (versionMinor == parseFloat(reqMinorVer)) {
+				if (versionRevision >= parseFloat(reqRevision))
+					return true;
+			}
+		}
+		return false;
+	}
+}
+
+function AC_AddExtension(src, ext)
+{
+  if (src.indexOf('?') != -1)
+    return src.replace(/\?/, ext+'?'); 
+  else
+    return src + ext;
+}
+
+function AC_Generateobj(objAttrs, params, embedAttrs) 
+{ 
+    var str = '';
+    if (isIE && isWin && !isOpera)
+    {
+  		str += '<object ';
+  		for (var i in objAttrs)
+  			str += i + '="' + objAttrs[i] + '" ';
+  		str += '>';
+  		for (var i in params)
+  			str += '<param name="' + i + '" value="' + params[i] + '" /> ';
+  		str += '</object>';
+    } else {
+  		str += '<embed ';
+  		for (var i in embedAttrs)
+  			str += i + '="' + embedAttrs[i] + '" ';
+  		str += '> </embed>';
+    }
+
+    document.write(str);
+}
+
+function AC_FL_RunContent(){
+  var ret = 
+    AC_GetArgs
+    (  arguments, ".swf", "movie", "clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"
+     , "application/x-shockwave-flash"
+    );
+  AC_Generateobj(ret.objAttrs, ret.params, ret.embedAttrs);
+}
+
+function AC_GetArgs(args, ext, srcParamName, classid, mimeType){
+  var ret = new Object();
+  ret.embedAttrs = new Object();
+  ret.params = new Object();
+  ret.objAttrs = new Object();
+  for (var i=0; i < args.length; i=i+2){
+    var currArg = args[i].toLowerCase();    
+
+    switch (currArg){	
+      case "classid":
+        break;
+      case "pluginspage":
+        ret.embedAttrs[args[i]] = args[i+1];
+        break;
+      case "src":
+      case "movie":	
+        args[i+1] = AC_AddExtension(args[i+1], ext);
+        ret.embedAttrs["src"] = args[i+1];
+        ret.params[srcParamName] = args[i+1];
+        break;
+      case "onafterupdate":
+      case "onbeforeupdate":
+      case "onblur":
+      case "oncellchange":
+      case "onclick":
+      case "ondblClick":
+      case "ondrag":
+      case "ondragend":
+      case "ondragenter":
+      case "ondragleave":
+      case "ondragover":
+      case "ondrop":
+      case "onfinish":
+      case "onfocus":
+      case "onhelp":
+      case "onmousedown":
+      case "onmouseup":
+      case "onmouseover":
+      case "onmousemove":
+      case "onmouseout":
+      case "onkeypress":
+      case "onkeydown":
+      case "onkeyup":
+      case "onload":
+      case "onlosecapture":
+      case "onpropertychange":
+      case "onreadystatechange":
+      case "onrowsdelete":
+      case "onrowenter":
+      case "onrowexit":
+      case "onrowsinserted":
+      case "onstart":
+      case "onscroll":
+      case "onbeforeeditfocus":
+      case "onactivate":
+      case "onbeforedeactivate":
+      case "ondeactivate":
+      case "type":
+      case "codebase":
+        ret.objAttrs[args[i]] = args[i+1];
+        break;
+      case "id":
+      case "width":
+      case "height":
+      case "align":
+      case "vspace": 
+      case "hspace":
+      case "class":
+      case "title":
+      case "accesskey":
+      case "name":
+      case "tabindex":
+        ret.embedAttrs[args[i]] = ret.objAttrs[args[i]] = args[i+1];
+        break;
+      default:
+        ret.embedAttrs[args[i]] = ret.params[args[i]] = args[i+1];
+    }
+  }
+  ret.objAttrs["classid"] = classid;
+  if (mimeType) ret.embedAttrs["type"] = mimeType;
+  return ret;
+}
+
+
Index: lams_central/web/fckeditor/editor/plugins/videorecorder/VideoRecorderFCKEditor.html
===================================================================
diff -u
--- lams_central/web/fckeditor/editor/plugins/videorecorder/VideoRecorderFCKEditor.html	(revision 0)
+++ lams_central/web/fckeditor/editor/plugins/videorecorder/VideoRecorderFCKEditor.html	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
@@ -0,0 +1,121 @@
+<!-- saved from url=(0014)about:internet -->
+<html lang="en">
+
+<!-- 
+Smart developers always View Source. 
+
+This application was built using Adobe Flex, an open source framework
+for building rich Internet applications that get delivered via the
+Flash Player or to desktops via Adobe AIR. 
+
+Learn more about Flex at http://flex.org 
+// -->
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+<!--  BEGIN Browser History required section -->
+<link rel="stylesheet" type="text/css" href="history/history.css" />
+<!--  END Browser History required section -->
+
+<title></title>
+<script src="AC_OETags.js" language="javascript"></script>
+
+<!--  BEGIN Browser History required section -->
+<script src="history/history.js" language="javascript"></script>
+<!--  END Browser History required section -->
+
+<style>
+body { margin: 0px; overflow:hidden }
+</style>
+<script language="JavaScript" type="text/javascript">
+<!--
+// -----------------------------------------------------------------------------
+// Globals
+// Major version of Flash required
+var requiredMajorVersion = 9;
+// Minor version of Flash required
+var requiredMinorVersion = 0;
+// Minor version of Flash required
+var requiredRevision = 124;
+// -----------------------------------------------------------------------------
+// -->
+</script>
+</head>
+
+<body scroll="no">
+<script language="JavaScript" type="text/javascript">
+<!--
+// Version check for the Flash Player that has the ability to start Player Product Install (6.0r65)
+var hasProductInstall = DetectFlashVer(6, 0, 65);
+
+// Version check based upon the values defined in globals
+var hasRequestedVersion = DetectFlashVer(requiredMajorVersion, requiredMinorVersion, requiredRevision);
+
+if ( hasProductInstall && !hasRequestedVersion ) {
+	// DO NOT MODIFY THE FOLLOWING FOUR LINES
+	// Location visited after installation is complete if installation is required
+	var MMPlayerType = (isIE == true) ? "ActiveX" : "PlugIn";
+	var MMredirectURL = window.location;
+    document.title = document.title.slice(0, 47) + " - Flash Player Installation";
+    var MMdoctitle = document.title;
+
+	AC_FL_RunContent(
+		"src", "playerProductInstall",
+		"FlashVars", "MMredirectURL="+MMredirectURL+'&MMplayerType='+MMPlayerType+'&MMdoctitle='+MMdoctitle+"",
+		"width", "361",
+		"height", "331",
+		"align", "middle",
+		"id", "VideoRecorderFCKEditor",
+		"quality", "high",
+		"bgcolor", "#869ca7",
+		"name", "VideoRecorderFCKEditor",
+		"allowScriptAccess","sameDomain",
+		"type", "application/x-shockwave-flash",
+		"pluginspage", "http://www.adobe.com/go/getflashplayer"
+	);
+} else if (hasRequestedVersion) {
+	// if we've detected an acceptable version
+	// embed the Flash Content SWF when all tests are passed
+	AC_FL_RunContent(
+			"src", "VideoRecorderFCKEditor",
+			"width", "361",
+			"height", "331",
+			"align", "middle",
+			"id", "VideoRecorderFCKEditor",
+			"quality", "high",
+			"bgcolor", "#869ca7",
+			"name", "VideoRecorderFCKEditor",
+			"allowScriptAccess","sameDomain",
+			"type", "application/x-shockwave-flash",
+			"pluginspage", "http://www.adobe.com/go/getflashplayer"
+	);
+  } else {  // flash is too old or we can't detect the plugin
+    var alternateContent = 'Alternate HTML content should be placed here. '
+  	+ 'This content requires the Adobe Flash Player. '
+   	+ '<a href=http://www.adobe.com/go/getflash/>Get Flash</a>';
+    document.write(alternateContent);  // insert non-flash content
+  }
+// -->
+</script>
+<noscript>
+  	<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
+			id="VideoRecorderFCKEditor" width="361" height="331"
+			codebase="http://fpdownload.macromedia.com/get/flashplayer/current/swflash.cab">
+			<param name="movie" value="VideoRecorderFCKEditor.swf" />
+			<param name="quality" value="high" />
+			<param name="bgcolor" value="#869ca7" />
+			<param name="allowScriptAccess" value="sameDomain" />
+			<embed src="VideoRecorderFCKEditor.swf" quality="high" bgcolor="#869ca7"
+				width="361" height="331" name="VideoRecorderFCKEditor" align="middle"
+				play="true"
+				loop="false"
+				quality="high"
+				allowScriptAccess="sameDomain"
+				type="application/x-shockwave-flash"
+				pluginspage="http://www.adobe.com/go/getflashplayer">
+			</embed>
+	</object>
+</noscript>
+</body>
+</html>
Index: lams_central/web/fckeditor/editor/plugins/videorecorder/VideoRecorderFCKEditor.jsp
===================================================================
diff -u
--- lams_central/web/fckeditor/editor/plugins/videorecorder/VideoRecorderFCKEditor.jsp	(revision 0)
+++ lams_central/web/fckeditor/editor/plugins/videorecorder/VideoRecorderFCKEditor.jsp	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
@@ -0,0 +1,216 @@
+<%@ page import="org.lamsfoundation.lams.util.Configuration" %>
+<%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<!-- saved from url=(0014)about:internet -->
+<lams:html>
+
+<!-- 
+Smart developers always View Source. 
+
+This application was built using Adobe Flex, an open source framework
+for building rich Internet applications that get delivered via the
+Flash Player or to desktops via Adobe AIR. 
+
+Learn more about Flex at http://flex.org 
+// -->
+
+<lams:head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<lams:css style="core"/>
+
+<title></title>
+<script src="AC_OETags.js" language="javascript"></script>
+<script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery-latest.pack.js"></script>
+
+<!--  BEGIN Browser History required section -->
+<script src="history/history.js" language="javascript"></script>
+<!--  END Browser History required section -->
+
+<style>
+body { margin: 0px; overflow:hidden }
+</style>
+<script language="JavaScript" type="text/javascript">
+<!--
+// -----------------------------------------------------------------------------
+// Globals
+// Major version of Flash required
+var requiredMajorVersion = 9;
+// Minor version of Flash required
+var requiredMinorVersion = 0;
+// Minor version of Flash required
+var requiredRevision = 124;
+// -----------------------------------------------------------------------------
+// -->
+</script>
+</lams:head>
+
+<body scroll="no">
+<script language="JavaScript" type="text/javascript">
+
+var oEditor = window.opener;
+var FCKVideoRecorder=null;
+var eSelected=null;
+var languageXML = '';
+
+ // Look for fckeditor
+if(oEditor && typeof(oEditor.FCKVideoRecorder)!='undefined')
+{
+    FCKVideoRecorder = oEditor.FCKVideoRecorder;
+    FCKConfig = oEditor.FCKConfig;
+    FCKLang = oEditor.FCKLang;
+    
+	if(FCKVideoRecorder) 
+		eSelected = oEditor.FCKSelection.GetSelectedElement();
+}
+
+function getLanguageXML(){
+	var languageCollection = new Array('videorecorder_video_player', 'videorecorder_video_recorder',
+		'videorecorder_web_application_not_available', 'videorecorder_net_connection_not_connected',
+		'videorecorder_net_connection_closed', 'videorecorder_playing', 'videorecorder_ready', 'videorecorder_recording',
+		'videorecorder_paused', 'videorecorder_waiting', 'videorecorder_description', 'videorecorder_title',
+		'videorecorder_new_recording_details', 'videorecorder_recording_complete_authoring',
+		'videorecorder_enter_something_here', 'videorecorder_recording_complete_fck', 'videorecorder_tooltip_play',
+		'videorecorder_tooltip_pause', 'videorecorder_tooltip_resume', 'videorecorder_tooltip_save_recording',
+		'videorecorder_tooltip_start_recording', 'videorecorder_tooltip_start_recording_again',
+		'videorecorder_tooltip_start_recording_next', 'videorecorder_tooltip_stop_recording',
+		'videorecorder_disabled', 'button_save', 'button_ok', 'button_cancel', 'button_yes', 'button_no');
+	
+	var languageOutput = "<xml><language>";
+	
+	for(var i = 0; i < languageCollection.length; i++){
+		var key = languageCollection[i];
+		var keyForXML = key.replace(/_/g, ".");
+				
+		languageOutput += "<entry key='" + keyForXML + "'><name>" + FCKLang[key] + "</name></entry>";
+	}
+	
+	languageOutput += "</language></xml>";
+	
+	return languageOutput;
+}
+
+function getMyApp(appName) {
+    if (navigator.appName.indexOf ("Microsoft") !=-1) {
+        return window[appName];
+    } else {
+        return document[appName];
+    }
+}
+
+function saveToFCKEditor(eventObj) {
+	var innerHTML = '';
+
+	<!-- 
+	innerHTML +=	'<OBJECT id="VideoRecorderFCKEditor"'
+	innerHTML +=	'        width="361" height="331" >';
+	innerHTML +=	'<param name="movie" value="' + FCKConfig.PluginsPath + 'videorecorder/VideoRecorderFCKEditor.swf" />';
+	innerHTML +=	'<param name="quality" value="high" />';
+	innerHTML +=	'<param name="bgcolor" value="#ffffff" />';
+	innerHTML +=	'<param name="allowScriptAccess" value="sameDomain" />';
+	innerHTML +=	'<embed src="' + FCKConfig.PluginsPath + 'videorecorder/VideoRecorderFCKEditor.swf" quality="high" bgcolor="#869ca7"';
+	innerHTML +=	'width="361" height="331" name="VideoRecorderFCKEditor" align="middle"';
+	innerHTML +=	'play="true"';
+	innerHTML +=	'loop="false"';
+	innerHTML +=	'quality="high"';
+	innerHTML +=	'allowScriptAccess="always"';
+	innerHTML +=	'type="application/x-shockwave-flash"';
+	//innerHTML +=	'FlashVars="mode=playerModeOnline' + '&red5ServerUrl=<%= Configuration.get(ConfigurationKeys.RED5_SERVER_URL) %>' + '&filename=' + eventObj.filename + '&languageXML=' + escape(getLanguageXML()) + '"';
+	innerHTML +=	'FlashVars="mode=playerModeOffline' + '&red5ServerUrl=<%= Configuration.get(ConfigurationKeys.RED5_SERVER_URL) %>' + '&filename=' + eventObj.filename + '&languageXML=' + escape(getLanguageXML()) + '"';
+	innerHTML +=	'pluginspage="http://www.adobe.com/go/getflashplayer">';
+	innerHTML +=	'</embed>';
+	innerHTML +=	'</OBJECT>';
+	// -->
+	
+	FCKVideoRecorder.Add(innerHTML);
+	window.close();
+}
+</script>
+<table>
+	<tr>
+		<td>
+			<script language="JavaScript" type="text/javascript">
+			<!--
+			// Version check for the Flash Player that has the ability to start Player Product Install (6.0r65)
+			var hasProductInstall = DetectFlashVer(6, 0, 65);
+			
+			// Version check based upon the values defined in globals
+			var hasRequestedVersion = DetectFlashVer(requiredMajorVersion, requiredMinorVersion, requiredRevision);
+			
+			if ( hasProductInstall && !hasRequestedVersion ) {
+				// DO NOT MODIFY THE FOLLOWING FOUR LINES
+				// Location visited after installation is complete if installation is required
+				var MMPlayerType = (isIE == true) ? "ActiveX" : "PlugIn";
+				var MMredirectURL = window.location;
+			    document.title = document.title.slice(0, 47) + " - Flash Player Installation";
+			    var MMdoctitle = document.title;
+			
+				AC_FL_RunContent(
+					"src", "playerProductInstall",
+					"FlashVars", "MMredirectURL="+MMredirectURL+'&MMplayerType='+MMPlayerType+'&MMdoctitle='+MMdoctitle+"",
+					"width", "361",
+					"height", "331",
+					"align", "middle",
+					"id", "VideoRecorderFCKEditor",
+					"quality", "high",
+					"bgcolor", "#ffffff",
+					"name", "VideoRecorderFCKEditor",
+					"allowScriptAccess","always",
+					"type", "application/x-shockwave-flash",
+					"pluginspage", "http://www.adobe.com/go/getflashplayer"
+				);
+			} else if (hasRequestedVersion) {
+				// if we've detected an acceptable version
+				// embed the Flash Content SWF when all tests are passed
+				AC_FL_RunContent(
+						"src", "VideoRecorderFCKEditor",
+						"FlashVars", "mode=recorderModeFCK"+'&serverUrl=<%= Configuration.get(ConfigurationKeys.SERVER_URL) %>'+'&red5ServerUrl=<%= Configuration.get(ConfigurationKeys.RED5_SERVER_URL) %>'+'&red5RecordingsUrl=<%= Configuration.get(ConfigurationKeys.RED5_RECORDINGS_URL) %>'+'&lamsEarDir=<%= Configuration.get(ConfigurationKeys.LAMS_EAR_DIR) %>' +'&saveToLamsDestUrl=/lams-www.war/secure/' + FCKConfig.ContentFolderID + '/Recordings/' + '&contentFolderUrl=/lams/www/secure/' + FCKConfig.ContentFolderID + '/Recordings/' + '&languageXML=' + escape(getLanguageXML()) + "",
+						"width", "361",
+						"height", "331",
+						"align", "middle",
+						"id", "VideoRecorderFCKEditor",
+						"quality", "high",
+						"bgcolor", "#ffffff",
+						"name", "VideoRecorderFCKEditor",
+						"allowScriptAccess","sameDomain",
+						"type", "application/x-shockwave-flash",
+						"pluginspage", "http://www.adobe.com/go/getflashplayer"
+				);
+			  } else {  // flash is too old or we can't detect the plugin
+			    var alternateContent = 'Alternate HTML content should be placed here. '
+			  	+ 'This content requires the Adobe Flash Player. '
+			   	+ '<a href=http://www.adobe.com/go/getflash/>Get Flash</a>';
+			    document.write(alternateContent);  // insert non-flash content
+			  }
+			// -->
+			</script>
+			<noscript>
+			  	<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
+						id="VideoRecorderFCKEditor" width="361" height="331"
+						codebase="http://fpdownload.macromedia.com/get/flashplayer/current/swflash.cab">
+						<param name="movie" value="VideoRecorderFCKEditor.swf" />
+						<param name="quality" value="high" />
+						<param name="bgcolor" value="#ffffff" />
+						<param name="allowScriptAccess" value="sameDomain" />
+						<embed src="VideoRecorderFCKEditor.swf" quality="high" bgcolor="#869ca7"
+							width="361" height="331" name="VideoRecorderFCKEditor" align="middle"
+							play="true"
+							loop="false"
+							quality="high"
+							allowScriptAccess="always"
+							type="application/x-shockwave-flash"
+							pluginspage="http://www.adobe.com/go/getflashplayer">
+						</embed>
+				</object>
+			</noscript>
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<fmt:message key="videorecorder.instructions.fck"></fmt:message>
+		</td>
+	</tr>
+</table>
+</body>
+</lams:html>
Index: lams_central/web/fckeditor/editor/plugins/videorecorder/VideoRecorderFCKEditor.swf
===================================================================
diff -u
Binary files differ
Index: lams_central/web/fckeditor/editor/plugins/videorecorder/assets/images/24-heart-gold.png
===================================================================
diff -u
Binary files differ
Index: lams_central/web/fckeditor/editor/plugins/videorecorder/assets/images/24-heart-red.png
===================================================================
diff -u
Binary files differ
Index: lams_central/web/fckeditor/editor/plugins/videorecorder/assets/images/24-heart-silver.png
===================================================================
diff -u
Binary files differ
Index: lams_central/web/fckeditor/editor/plugins/videorecorder/assets/images/deleteIcon.swf
===================================================================
diff -u
Binary files differ
Index: lams_central/web/fckeditor/editor/plugins/videorecorder/assets/images/downArrow.swf
===================================================================
diff -u
Binary files differ
Index: lams_central/web/fckeditor/editor/plugins/videorecorder/assets/images/exportIcon.swf
===================================================================
diff -u
Binary files differ
Index: lams_central/web/fckeditor/editor/plugins/videorecorder/assets/images/okIcon.swf
===================================================================
diff -u
Binary files differ
Index: lams_central/web/fckeditor/editor/plugins/videorecorder/assets/images/pauseIcon.swf
===================================================================
diff -u
Binary files differ
Index: lams_central/web/fckeditor/editor/plugins/videorecorder/assets/images/playIcon.swf
===================================================================
diff -u
Binary files differ
Index: lams_central/web/fckeditor/editor/plugins/videorecorder/assets/images/playerVolume.png
===================================================================
diff -u
Binary files differ
Index: lams_central/web/fckeditor/editor/plugins/videorecorder/assets/images/recordIcon.swf
===================================================================
diff -u
Binary files differ
Index: lams_central/web/fckeditor/editor/plugins/videorecorder/assets/images/upArrow.swf
===================================================================
diff -u
Binary files differ
Index: lams_central/web/fckeditor/editor/plugins/videorecorder/assets/styles/main.css
===================================================================
diff -u
--- lams_central/web/fckeditor/editor/plugins/videorecorder/assets/styles/main.css	(revision 0)
+++ lams_central/web/fckeditor/editor/plugins/videorecorder/assets/styles/main.css	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
@@ -0,0 +1,35 @@
+Application {
+	backgroundColor:#ECECEC;	
+	backgroundGradientColors:#ECECEC,#ECECEC;
+}
+
+Tile {
+	top: 10;
+	bottom: 10;
+	left: 10;
+	right: 10;
+}
+
+Label {
+	color: #000000;
+	fontWeight: bold;
+	fontSize: 14;
+}
+
+.box {
+	borderColor: #50B2CB;
+	cornerRadius: 10;
+	borderStyle: solid;
+	borderThickness: 1;
+	paddingBottom: 10;
+	paddingTop: 10;
+	paddingLeft: 10;
+	paddingRight: 10;
+	backgroundColor:#ffffff;
+	backgroundAlpha: 1;
+}
+
+Text {
+	fontSize: 12;
+	fontWeight: normal;
+}
\ No newline at end of file
Index: lams_central/web/fckeditor/editor/plugins/videorecorder/fckplugin.js
===================================================================
diff -u
--- lams_central/web/fckeditor/editor/plugins/videorecorder/fckplugin.js	(revision 0)
+++ lams_central/web/fckeditor/editor/plugins/videorecorder/fckplugin.js	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
@@ -0,0 +1,60 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+// the command to launch
+var InsertVideoRecorderCommand=function(){};
+
+InsertVideoRecorderCommand.prototype.Execute=function(){ }
+
+InsertVideoRecorderCommand.GetState=function() {
+        return FCK_TRISTATE_OFF;
+}
+
+// the popup
+var popup = null;
+InsertVideoRecorderCommand.Execute=function() 
+{
+  //open a popup window when the button is clicked
+	if (popup==null || popup.closed || !popup.location){
+   		popup= window.open( FCKConfig.PluginsPath + 'videorecorder/VideoRecorderFCKEditor.jsp', 'VideoRecorder', 'width=380,height=440,status=no,scrollbars=no,resizable=no,location=no,toolbar=no');
+	}
+
+ popup.focus();
+}
+
+// register the command with fckeditor
+FCKCommands.RegisterCommand( 'VideoRecorder', InsertVideoRecorderCommand ) ;
+
+// place the toolbar button
+var oVideoRecorderItem = new FCKToolbarButton( 'VideoRecorder', FCKLang['VideoRecorderBtn'] ) ;
+oVideoRecorderItem.IconPath =  FCKConfig.PluginsPath + 'videorecorder/icon.png' ;
+
+FCKToolbarItems.RegisterItem( 'VideoRecorder', oVideoRecorderItem ) ;
+
+// create an object to handle videorecorder
+var FCKVideoRecorder= new Object() ;
+
+FCKVideoRecorder.Add = function( innerHTML )
+{
+	FCK.InsertHtml(innerHTML);
+}
\ No newline at end of file
Index: lams_central/web/fckeditor/editor/plugins/videorecorder/history/history.css
===================================================================
diff -u
--- lams_central/web/fckeditor/editor/plugins/videorecorder/history/history.css	(revision 0)
+++ lams_central/web/fckeditor/editor/plugins/videorecorder/history/history.css	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
@@ -0,0 +1,6 @@
+/* This CSS stylesheet defines styles used by required elements in a flex application page that supports browser history */
+
+#ie_historyFrame { width: 0px; height: 0px; display:none }
+#firefox_anchorDiv { width: 0px; height: 0px; display:none }
+#safari_formDiv { width: 0px; height: 0px; display:none }
+#safari_rememberDiv { width: 0px; height: 0px; display:none }
Index: lams_central/web/fckeditor/editor/plugins/videorecorder/history/history.js
===================================================================
diff -u
--- lams_central/web/fckeditor/editor/plugins/videorecorder/history/history.js	(revision 0)
+++ lams_central/web/fckeditor/editor/plugins/videorecorder/history/history.js	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
@@ -0,0 +1,662 @@
+BrowserHistoryUtils = {
+    addEvent: function(elm, evType, fn, useCapture) {
+        useCapture = useCapture || false;
+        if (elm.addEventListener) {
+            elm.addEventListener(evType, fn, useCapture);
+            return true;
+        }
+        else if (elm.attachEvent) {
+            var r = elm.attachEvent('on' + evType, fn);
+            return r;
+        }
+        else {
+            elm['on' + evType] = fn;
+        }
+    }
+}
+
+BrowserHistory = (function() {
+    // type of browser
+    var browser = {
+        ie: false, 
+        firefox: false, 
+        safari: false, 
+        opera: false, 
+        version: -1
+    };
+
+    // if setDefaultURL has been called, our first clue
+    // that the SWF is ready and listening
+    //var swfReady = false;
+
+    // the URL we'll send to the SWF once it is ready
+    //var pendingURL = '';
+
+    // Default app state URL to use when no fragment ID present
+    var defaultHash = '';
+
+    // Last-known app state URL
+    var currentHref = document.location.href;
+
+    // Initial URL (used only by IE)
+    var initialHref = document.location.href;
+
+    // Initial URL (used only by IE)
+    var initialHash = document.location.hash;
+
+    // History frame source URL prefix (used only by IE)
+    var historyFrameSourcePrefix = 'history/historyFrame.html?';
+
+    // History maintenance (used only by Safari)
+    var currentHistoryLength = -1;
+
+    var historyHash = [];
+
+    var initialState = createState(initialHref, initialHref + '#' + initialHash, initialHash);
+
+    var backStack = [];
+    var forwardStack = [];
+
+    var currentObjectId = null;
+
+    //UserAgent detection
+    var useragent = navigator.userAgent.toLowerCase();
+
+    if (useragent.indexOf("opera") != -1) {
+        browser.opera = true;
+    } else if (useragent.indexOf("msie") != -1) {
+        browser.ie = true;
+        browser.version = parseFloat(useragent.substring(useragent.indexOf('msie') + 4));
+    } else if (useragent.indexOf("safari") != -1) {
+        browser.safari = true;
+        browser.version = parseFloat(useragent.substring(useragent.indexOf('safari') + 7));
+    } else if (useragent.indexOf("gecko") != -1) {
+        browser.firefox = true;
+    }
+
+    if (browser.ie == true && browser.version == 7) {
+        window["_ie_firstload"] = false;
+    }
+
+    // Accessor functions for obtaining specific elements of the page.
+    function getHistoryFrame()
+    {
+        return document.getElementById('ie_historyFrame');
+    }
+
+    function getAnchorElement()
+    {
+        return document.getElementById('firefox_anchorDiv');
+    }
+
+    function getFormElement()
+    {
+        return document.getElementById('safari_formDiv');
+    }
+
+    function getRememberElement()
+    {
+        return document.getElementById("safari_remember_field");
+    }
+
+    // Get the Flash player object for performing ExternalInterface callbacks.
+    // Updated for changes to SWFObject2.
+    function getPlayer(id) {
+		if (id && document.getElementById(id)) {
+			var r = document.getElementById(id);
+			if (typeof r.SetVariable != "undefined") {
+				return r;
+			}
+			else {
+				var o = r.getElementsByTagName("object");
+				var e = r.getElementsByTagName("embed");
+				if (o.length > 0 && typeof o[0].SetVariable != "undefined") {
+					return o[0];
+				}
+				else if (e.length > 0 && typeof e[0].SetVariable != "undefined") {
+					return e[0];
+				}
+			}
+		}
+		else {
+			var o = document.getElementsByTagName("object");
+			var e = document.getElementsByTagName("embed");
+			if (e.length > 0 && typeof e[0].SetVariable != "undefined") {
+				return e[0];
+			}
+			else if (o.length > 0 && typeof o[0].SetVariable != "undefined") {
+				return o[0];
+			}
+			else if (o.length > 1 && typeof o[1].SetVariable != "undefined") {
+				return o[1];
+			}
+		}
+		return undefined;
+	}
+    
+    function getPlayers() {
+        var players = [];
+        if (players.length == 0) {
+            var tmp = document.getElementsByTagName('object');
+            players = tmp;
+        }
+        
+        if (players.length == 0 || players[0].object == null) {
+            var tmp = document.getElementsByTagName('embed');
+            players = tmp;
+        }
+        return players;
+    }
+
+	function getIframeHash() {
+		var doc = getHistoryFrame().contentWindow.document;
+		var hash = String(doc.location.search);
+		if (hash.length == 1 && hash.charAt(0) == "?") {
+			hash = "";
+		}
+		else if (hash.length >= 2 && hash.charAt(0) == "?") {
+			hash = hash.substring(1);
+		}
+		return hash;
+	}
+
+    /* Get the current location hash excluding the '#' symbol. */
+    function getHash() {
+       // It would be nice if we could use document.location.hash here,
+       // but it's faulty sometimes.
+       var idx = document.location.href.indexOf('#');
+       return (idx >= 0) ? document.location.href.substr(idx+1) : '';
+    }
+
+    /* Get the current location hash excluding the '#' symbol. */
+    function setHash(hash) {
+       // It would be nice if we could use document.location.hash here,
+       // but it's faulty sometimes.
+       if (hash == '') hash = '#'
+       document.location.hash = hash;
+    }
+
+    function createState(baseUrl, newUrl, flexAppUrl) {
+        return { 'baseUrl': baseUrl, 'newUrl': newUrl, 'flexAppUrl': flexAppUrl, 'title': null };
+    }
+
+    /* Add a history entry to the browser.
+     *   baseUrl: the portion of the location prior to the '#'
+     *   newUrl: the entire new URL, including '#' and following fragment
+     *   flexAppUrl: the portion of the location following the '#' only
+     */
+    function addHistoryEntry(baseUrl, newUrl, flexAppUrl) {
+
+        //delete all the history entries
+        forwardStack = [];
+
+        if (browser.ie) {
+            //Check to see if we are being asked to do a navigate for the first
+            //history entry, and if so ignore, because it's coming from the creation
+            //of the history iframe
+            if (flexAppUrl == defaultHash && document.location.href == initialHref && window['_ie_firstload']) {
+                currentHref = initialHref;
+                return;
+            }
+            if ((!flexAppUrl || flexAppUrl == defaultHash) && window['_ie_firstload']) {
+                newUrl = baseUrl + '#' + defaultHash;
+                flexAppUrl = defaultHash;
+            } else {
+                // for IE, tell the history frame to go somewhere without a '#'
+                // in order to get this entry into the browser history.
+                getHistoryFrame().src = historyFrameSourcePrefix + flexAppUrl;
+            }
+            setHash(flexAppUrl);
+        } else {
+
+            //ADR
+            if (backStack.length == 0 && initialState.flexAppUrl == flexAppUrl) {
+                initialState = createState(baseUrl, newUrl, flexAppUrl);
+            } else if(backStack.length > 0 && backStack[backStack.length - 1].flexAppUrl == flexAppUrl) {
+                backStack[backStack.length - 1] = createState(baseUrl, newUrl, flexAppUrl);
+            }
+
+            if (browser.safari) {
+                // for Safari, submit a form whose action points to the desired URL
+                if (browser.version <= 419.3) {
+                    var file = window.location.pathname.toString();
+                    file = file.substring(file.lastIndexOf("/")+1);
+                    getFormElement().innerHTML = '<form name="historyForm" action="'+file+'#' + flexAppUrl + '" method="GET"></form>';
+                    //get the current elements and add them to the form
+                    var qs = window.location.search.substring(1);
+                    var qs_arr = qs.split("&");
+                    for (var i = 0; i < qs_arr.length; i++) {
+                        var tmp = qs_arr[i].split("=");
+                        var elem = document.createElement("input");
+                        elem.type = "hidden";
+                        elem.name = tmp[0];
+                        elem.value = tmp[1];
+                        document.forms.historyForm.appendChild(elem);
+                    }
+                    document.forms.historyForm.submit();
+                } else {
+                    top.location.hash = flexAppUrl;
+                }
+                // We also have to maintain the history by hand for Safari
+                historyHash[history.length] = flexAppUrl;
+                _storeStates();
+            } else {
+                // Otherwise, write an anchor into the page and tell the browser to go there
+                addAnchor(flexAppUrl);
+                setHash(flexAppUrl);
+            }
+        }
+        backStack.push(createState(baseUrl, newUrl, flexAppUrl));
+    }
+
+    function _storeStates() {
+        if (browser.safari) {
+            getRememberElement().value = historyHash.join(",");
+        }
+    }
+
+    function handleBackButton() {
+        //The "current" page is always at the top of the history stack.
+        var current = backStack.pop();
+        if (!current) { return; }
+        var last = backStack[backStack.length - 1];
+        if (!last && backStack.length == 0){
+            last = initialState;
+        }
+        forwardStack.push(current);
+    }
+
+    function handleForwardButton() {
+        //summary: private method. Do not call this directly.
+
+        var last = forwardStack.pop();
+        if (!last) { return; }
+        backStack.push(last);
+    }
+
+    function handleArbitraryUrl() {
+        //delete all the history entries
+        forwardStack = [];
+    }
+
+    /* Called periodically to poll to see if we need to detect navigation that has occurred */
+    function checkForUrlChange() {
+
+        if (browser.ie) {
+            if (currentHref != document.location.href && currentHref + '#' != document.location.href) {
+                //This occurs when the user has navigated to a specific URL
+                //within the app, and didn't use browser back/forward
+                //IE seems to have a bug where it stops updating the URL it
+                //shows the end-user at this point, but programatically it
+                //appears to be correct.  Do a full app reload to get around
+                //this issue.
+                if (browser.version < 7) {
+                    currentHref = document.location.href;
+                    document.location.reload();
+                } else {
+					if (getHash() != getIframeHash()) {
+						// this.iframe.src = this.blankURL + hash;
+						var sourceToSet = historyFrameSourcePrefix + getHash();
+						getHistoryFrame().src = sourceToSet;
+					}
+                }
+            }
+        }
+
+        if (browser.safari) {
+            // For Safari, we have to check to see if history.length changed.
+            if (currentHistoryLength >= 0 && history.length != currentHistoryLength) {
+                //alert("did change: " + history.length + ", " + historyHash.length + "|" + historyHash[history.length] + "|>" + historyHash.join("|"));
+                // If it did change, then we have to look the old state up
+                // in our hand-maintained array since document.location.hash
+                // won't have changed, then call back into BrowserManager.
+                currentHistoryLength = history.length;
+                var flexAppUrl = historyHash[currentHistoryLength];
+                if (flexAppUrl == '') {
+                    //flexAppUrl = defaultHash;
+                }
+                //ADR: to fix multiple
+                if (typeof BrowserHistory_multiple != "undefined" && BrowserHistory_multiple == true) {
+                    var pl = getPlayers();
+                    for (var i = 0; i < pl.length; i++) {
+                        pl[i].browserURLChange(flexAppUrl);
+                    }
+                } else {
+                    getPlayer().browserURLChange(flexAppUrl);
+                }
+                _storeStates();
+            }
+        }
+        if (browser.firefox) {
+            if (currentHref != document.location.href) {
+                var bsl = backStack.length;
+
+                var urlActions = {
+                    back: false, 
+                    forward: false, 
+                    set: false
+                }
+
+                if ((window.location.hash == initialHash || window.location.href == initialHref) && (bsl == 1)) {
+                    urlActions.back = true;
+                    // FIXME: could this ever be a forward button?
+                    // we can't clear it because we still need to check for forwards. Ugg.
+                    // clearInterval(this.locationTimer);
+                    handleBackButton();
+                }
+                
+                // first check to see if we could have gone forward. We always halt on
+                // a no-hash item.
+                if (forwardStack.length > 0) {
+                    if (forwardStack[forwardStack.length-1].flexAppUrl == getHash()) {
+                        urlActions.forward = true;
+                        handleForwardButton();
+                    }
+                }
+
+                // ok, that didn't work, try someplace back in the history stack
+                if ((bsl >= 2) && (backStack[bsl - 2])) {
+                    if (backStack[bsl - 2].flexAppUrl == getHash()) {
+                        urlActions.back = true;
+                        handleBackButton();
+                    }
+                }
+                
+                if (!urlActions.back && !urlActions.forward) {
+                    var foundInStacks = {
+                        back: -1, 
+                        forward: -1
+                    }
+
+                    for (var i = 0; i < backStack.length; i++) {
+                        if (backStack[i].flexAppUrl == getHash() && i != (bsl - 2)) {
+                            arbitraryUrl = true;
+                            foundInStacks.back = i;
+                        }
+                    }
+                    for (var i = 0; i < forwardStack.length; i++) {
+                        if (forwardStack[i].flexAppUrl == getHash() && i != (bsl - 2)) {
+                            arbitraryUrl = true;
+                            foundInStacks.forward = i;
+                        }
+                    }
+                    handleArbitraryUrl();
+                }
+
+                // Firefox changed; do a callback into BrowserManager to tell it.
+                currentHref = document.location.href;
+                var flexAppUrl = getHash();
+                if (flexAppUrl == '') {
+                    //flexAppUrl = defaultHash;
+                }
+                //ADR: to fix multiple
+                if (typeof BrowserHistory_multiple != "undefined" && BrowserHistory_multiple == true) {
+                    var pl = getPlayers();
+                    for (var i = 0; i < pl.length; i++) {
+                        pl[i].browserURLChange(flexAppUrl);
+                    }
+                } else {
+                    getPlayer().browserURLChange(flexAppUrl);
+                }
+            }
+        }
+        //setTimeout(checkForUrlChange, 50);
+    }
+
+    /* Write an anchor into the page to legitimize it as a URL for Firefox et al. */
+    function addAnchor(flexAppUrl)
+    {
+       if (document.getElementsByName(flexAppUrl).length == 0) {
+           getAnchorElement().innerHTML += "<a name='" + flexAppUrl + "'>" + flexAppUrl + "</a>";
+       }
+    }
+
+    var _initialize = function () {
+        if (browser.ie)
+        {
+            var scripts = document.getElementsByTagName('script');
+            for (var i = 0, s; s = scripts[i]; i++) {
+                if (s.src.indexOf("history.js") > -1) {
+                    var iframe_location = (new String(s.src)).replace("history.js", "historyFrame.html");
+                }
+            }
+            historyFrameSourcePrefix = iframe_location + "?";
+            var src = historyFrameSourcePrefix;
+
+            var iframe = document.createElement("iframe");
+            iframe.id = 'ie_historyFrame';
+            iframe.name = 'ie_historyFrame';
+            //iframe.src = historyFrameSourcePrefix;
+            try {
+                document.body.appendChild(iframe);
+            } catch(e) {
+                setTimeout(function() {
+                    document.body.appendChild(iframe);
+                }, 0);
+            }
+        }
+
+        if (browser.safari)
+        {
+            var rememberDiv = document.createElement("div");
+            rememberDiv.id = 'safari_rememberDiv';
+            document.body.appendChild(rememberDiv);
+            rememberDiv.innerHTML = '<input type="text" id="safari_remember_field" style="width: 500px;">';
+
+            var formDiv = document.createElement("div");
+            formDiv.id = 'safari_formDiv';
+            document.body.appendChild(formDiv);
+
+            var reloader_content = document.createElement('div');
+            reloader_content.id = 'safarireloader';
+            var scripts = document.getElementsByTagName('script');
+            for (var i = 0, s; s = scripts[i]; i++) {
+                if (s.src.indexOf("history.js") > -1) {
+                    html = (new String(s.src)).replace(".js", ".html");
+                }
+            }
+            reloader_content.innerHTML = '<iframe id="safarireloader-iframe" src="about:blank" frameborder="no" scrolling="no"></iframe>';
+            document.body.appendChild(reloader_content);
+            reloader_content.style.position = 'absolute';
+            reloader_content.style.left = reloader_content.style.top = '-9999px';
+            iframe = reloader_content.getElementsByTagName('iframe')[0];
+
+            if (document.getElementById("safari_remember_field").value != "" ) {
+                historyHash = document.getElementById("safari_remember_field").value.split(",");
+            }
+
+        }
+
+        if (browser.firefox)
+        {
+            var anchorDiv = document.createElement("div");
+            anchorDiv.id = 'firefox_anchorDiv';
+            document.body.appendChild(anchorDiv);
+        }
+        
+        //setTimeout(checkForUrlChange, 50);
+    }
+
+    return {
+        historyHash: historyHash, 
+        backStack: function() { return backStack; }, 
+        forwardStack: function() { return forwardStack }, 
+        getPlayer: getPlayer, 
+        initialize: function(src) {
+            _initialize(src);
+        }, 
+        setURL: function(url) {
+            document.location.href = url;
+        }, 
+        getURL: function() {
+            return document.location.href;
+        }, 
+        getTitle: function() {
+            return document.title;
+        }, 
+        setTitle: function(title) {
+            try {
+                backStack[backStack.length - 1].title = title;
+            } catch(e) { }
+            //if on safari, set the title to be the empty string. 
+            if (browser.safari) {
+                if (title == "") {
+                    try {
+                    var tmp = window.location.href.toString();
+                    title = tmp.substring((tmp.lastIndexOf("/")+1), tmp.lastIndexOf("#"));
+                    } catch(e) {
+                        title = "";
+                    }
+                }
+            }
+            document.title = title;
+        }, 
+        setDefaultURL: function(def)
+        {
+            defaultHash = def;
+            def = getHash();
+            //trailing ? is important else an extra frame gets added to the history
+            //when navigating back to the first page.  Alternatively could check
+            //in history frame navigation to compare # and ?.
+            if (browser.ie)
+            {
+                window['_ie_firstload'] = true;
+                var sourceToSet = historyFrameSourcePrefix + def;
+                var func = function() {
+                    getHistoryFrame().src = sourceToSet;
+                    window.location.replace("#" + def);
+                    setInterval(checkForUrlChange, 50);
+                }
+                try {
+                    func();
+                } catch(e) {
+                    window.setTimeout(function() { func(); }, 0);
+                }
+            }
+
+            if (browser.safari)
+            {
+                currentHistoryLength = history.length;
+                if (historyHash.length == 0) {
+                    historyHash[currentHistoryLength] = def;
+                    var newloc = "#" + def;
+                    window.location.replace(newloc);
+                } else {
+                    //alert(historyHash[historyHash.length-1]);
+                }
+                //setHash(def);
+                setInterval(checkForUrlChange, 50);
+            }
+            
+            
+            if (browser.firefox || browser.opera)
+            {
+                var reg = new RegExp("#" + def + "$");
+                if (window.location.toString().match(reg)) {
+                } else {
+                    var newloc ="#" + def;
+                    window.location.replace(newloc);
+                }
+                setInterval(checkForUrlChange, 50);
+                //setHash(def);
+            }
+
+        }, 
+
+        /* Set the current browser URL; called from inside BrowserManager to propagate
+         * the application state out to the container.
+         */
+        setBrowserURL: function(flexAppUrl, objectId) {
+            if (browser.ie && typeof objectId != "undefined") {
+                currentObjectId = objectId;
+            }
+           //fromIframe = fromIframe || false;
+           //fromFlex = fromFlex || false;
+           //alert("setBrowserURL: " + flexAppUrl);
+           //flexAppUrl = (flexAppUrl == "") ? defaultHash : flexAppUrl ;
+
+           var pos = document.location.href.indexOf('#');
+           var baseUrl = pos != -1 ? document.location.href.substr(0, pos) : document.location.href;
+           var newUrl = baseUrl + '#' + flexAppUrl;
+
+           if (document.location.href != newUrl && document.location.href + '#' != newUrl) {
+               currentHref = newUrl;
+               addHistoryEntry(baseUrl, newUrl, flexAppUrl);
+               currentHistoryLength = history.length;
+           }
+
+           return false;
+        }, 
+
+        browserURLChange: function(flexAppUrl) {
+            var objectId = null;
+            if (browser.ie && currentObjectId != null) {
+                objectId = currentObjectId;
+            }
+            pendingURL = '';
+            
+            if (typeof BrowserHistory_multiple != "undefined" && BrowserHistory_multiple == true) {
+                var pl = getPlayers();
+                for (var i = 0; i < pl.length; i++) {
+                    try {
+                        pl[i].browserURLChange(flexAppUrl);
+                    } catch(e) { }
+                }
+            } else {
+                try {
+                    getPlayer(objectId).browserURLChange(flexAppUrl);
+                } catch(e) { }
+            }
+
+            currentObjectId = null;
+        }
+
+    }
+
+})();
+
+// Initialization
+
+// Automated unit testing and other diagnostics
+
+function setURL(url)
+{
+    document.location.href = url;
+}
+
+function backButton()
+{
+    history.back();
+}
+
+function forwardButton()
+{
+    history.forward();
+}
+
+function goForwardOrBackInHistory(step)
+{
+    history.go(step);
+}
+
+//BrowserHistoryUtils.addEvent(window, "load", function() { BrowserHistory.initialize(); });
+(function(i) {
+    var u =navigator.userAgent;var e=/*@cc_on!@*/false; 
+    var st = setTimeout;
+    if(/webkit/i.test(u)){
+        st(function(){
+            var dr=document.readyState;
+            if(dr=="loaded"||dr=="complete"){i()}
+            else{st(arguments.callee,10);}},10);
+    } else if((/mozilla/i.test(u)&&!/(compati)/.test(u)) || (/opera/i.test(u))){
+        document.addEventListener("DOMContentLoaded",i,false);
+    } else if(e){
+    (function(){
+        var t=document.createElement('doc:rdy');
+        try{t.doScroll('left');
+            i();t=null;
+        }catch(e){st(arguments.callee,0);}})();
+    } else{
+        window.onload=i;
+    }
+})( function() {BrowserHistory.initialize();} );
Index: lams_central/web/fckeditor/editor/plugins/videorecorder/history/historyFrame.html
===================================================================
diff -u
--- lams_central/web/fckeditor/editor/plugins/videorecorder/history/historyFrame.html	(revision 0)
+++ lams_central/web/fckeditor/editor/plugins/videorecorder/history/historyFrame.html	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
@@ -0,0 +1,29 @@
+<html>
+    <head>
+        <META HTTP-EQUIV="Pragma" CONTENT="no-cache"> 
+        <META HTTP-EQUIV="Expires" CONTENT="-1"> 
+    </head>
+    <body>
+    <script>
+        function processUrl()
+        {
+
+            var pos = url.indexOf("?");
+            url = pos != -1 ? url.substr(pos + 1) : "";
+            if (!parent._ie_firstload) {
+                parent.BrowserHistory.setBrowserURL(url);
+                try {
+                    parent.BrowserHistory.browserURLChange(url);
+                } catch(e) { }
+            } else {
+                parent._ie_firstload = false;
+            }
+        }
+
+        var url = document.location.href;
+        processUrl();
+        document.write(encodeURIComponent(url));
+    </script>
+    Hidden frame for Browser History support.
+    </body>
+</html>
Index: lams_central/web/fckeditor/editor/plugins/videorecorder/icon.png
===================================================================
diff -u
Binary files differ
Index: lams_central/web/fckeditor/editor/plugins/videorecorder/lang/en.js
===================================================================
diff -u
--- lams_central/web/fckeditor/editor/plugins/videorecorder/lang/en.js	(revision 0)
+++ lams_central/web/fckeditor/editor/plugins/videorecorder/lang/en.js	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
@@ -0,0 +1,32 @@
+FCKLang.VideoRecorderBtn = 'Insert a video recording' ;
+FCKLang.button_ok = 'OK' ;
+FCKLang.button_save = 'Save' ;
+FCKLang.button_cancel = 'Cancel' ;
+FCKLang.button_yes = 'Yes' ;
+FCKLang.button_no = 'No' ;
+FCKLang.videorecorder_video_player = 'Video Player';
+FCKLang.videorecorder_video_recorder = 'Video Recorder';
+FCKLang.videorecorder_web_application_not_available = 'The requested web application is not available';
+FCKLang.videorecorder_net_connection_not_connected = 'Connection to the media server could not be established' ;
+FCKLang.videorecorder_net_connection_closed = 'Connection to the media server closed';
+FCKLang.videorecorder_playing = 'Playing';
+FCKLang.videorecorder_ready = 'Ready';
+FCKLang.videorecorder_paused = 'Paused';
+FCKLang.videorecorder_recording = 'Recording';
+FCKLang.videorecorder_buffering = 'Buffering';
+FCKLang.videorecorder_waiting = 'Waiting';
+FCKLang.videorecorder_description = 'Description';
+FCKLang.videorecorder_title = 'Title';
+FCKLang.videorecorder_new_recording_details = 'New Recording Details';
+FCKLang.videorecorder_recording_complete_authoring = 'Recording complete and added to the list of video recordings. Click the play button to review the last added recording or the record button to record another video.';
+FCKLang.videorecorder_enter_something_here = 'Enter {0} here';
+FCKLang.videorecorder_recording_complete_fck = 'Recording complete. Click the play button to review, the record button to overwrite the recording or the save button to post the current recording.';
+FCKLang.videorecorder_tooltip_play = 'Play the recording';
+FCKLang.videorecorder_tooltip_pause = 'Pause the recording being played';
+FCKLang.videorecorder_tooltip_resume = 'Resume the recording';
+FCKLang.videorecorder_tooltip_save_recording = 'Save the recording';
+FCKLang.videorecorder_tooltip_start_recording = 'Start recording';
+FCKLang.videorecorder_tooltip_start_recording_again = 'Start recording again (overwrites previous recording)';
+FCKLang.videorecorder_tooltip_start_recording_next = 'Record another recording';
+FCKLang.videorecorder_tooltip_stop_recording = 'Stop recording';
+FCKLang.videorecorder_disabled = 'Disabled';
\ No newline at end of file
Index: lams_central/web/fckeditor/editor/plugins/videorecorder/playerProductInstall.swf
===================================================================
diff -u
Binary files differ
Index: lams_central/web/fckeditor/editor/plugins/videorecorder/screenshot.png
===================================================================
diff -u
Binary files differ
Index: lams_central/web/includes/javascript/fckconfig_custom.js
===================================================================
diff -u -r88eb4c294f771222c09198b0f0aa3e8cdaa30a86 -r42aa5319fbd33938828764c43dd0ab1ca80e2416
--- lams_central/web/includes/javascript/fckconfig_custom.js	(.../fckconfig_custom.js)	(revision 88eb4c294f771222c09198b0f0aa3e8cdaa30a86)
+++ lams_central/web/includes/javascript/fckconfig_custom.js	(.../fckconfig_custom.js)	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
@@ -1,6 +1,6 @@
 FCKConfig.ToolbarSets["Default"] = [
 	['Source','-','FitWindow', 'Preview','PasteWord','Undo','Redo','Bold','Italic','Underline', '-','Subscript','Superscript','OrderedList','UnorderedList','-','Outdent','Indent','JustifyLeft','JustifyCenter','JustifyRight','JustifyFull','TextColor','BGColor','Equation'], 
-	['MoviePlayer','Image','Link','Table','Rule','Smiley','SpecialChar','Templates','FontFormat','FontName','FontSize','About']
+	['MoviePlayer','VideoRecorder','Image','Link','Table','Rule','Smiley','SpecialChar','Templates','FontFormat','FontName','FontSize','About']
 ] ;
 
 FCKConfig.ToolbarSets["Default-Learner"] = [
@@ -45,3 +45,4 @@
 FCKConfig.Plugins.Add('wikilink', 'en', FCKConfig.BasePath + '../../../tool/lawiki10/');
 FCKConfig.Plugins.Add('equation', 'en');
 FCKConfig.Plugins.Add('movieplayer', 'en');
+FCKConfig.Plugins.Add('videorecorder', 'en');
Index: lams_common/db/sql/insert_lams_windows_config_data.sql
===================================================================
diff -u -r00a6e145b37916eb1561ea5c68319b0fc691681b -r42aa5319fbd33938828764c43dd0ab1ca80e2416
--- lams_common/db/sql/insert_lams_windows_config_data.sql	(.../insert_lams_windows_config_data.sql)	(revision 00a6e145b37916eb1561ea5c68319b0fc691681b)
+++ lams_common/db/sql/insert_lams_windows_config_data.sql	(.../insert_lams_windows_config_data.sql)	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
@@ -245,4 +245,10 @@
 values ('SMTPUser','', 'config.smtp.user', 'config.header.email', 'STRING', 0);
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
-values ('SMTPPassword','', 'config.smtp.password', 'config.header.email', 'STRING', 0);
\ No newline at end of file
+values ('SMTPPassword','', 'config.smtp.password', 'config.header.email', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('Red5ServerUrl','rtmp://localhost/', 'config.red5.server.url', 'config.header.red5', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('Red5RecordingsUrl','http://localhost:8080/streams/', 'config.red5.recordings.url', 'config.header.red5', 'STRING', 1);
Index: lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
===================================================================
diff -u -r3b1c6836dcfb5f9b80c9284d1815139d1fc08b30 -r42aa5319fbd33938828764c43dd0ab1ca80e2416
--- lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java	(.../ConfigurationKeys.java)	(revision 3b1c6836dcfb5f9b80c9284d1815139d1fc08b30)
+++ lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java	(.../ConfigurationKeys.java)	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
@@ -244,7 +244,11 @@
     public static String ADMIN_SCREEN_SIZE = "AdminScreenSize";
 
     public static String GMAP_KEY = "GmapKey";
+        
+    public static String RED5_SERVER_URL = "Red5ServerUrl";
     
+    public static String RED5_RECORDINGS_URL = "Red5RecordingsUrl";
+    
     public static String SMTP_AUTH_USER = "SMTPUser";
     
     public static String SMTP_AUTH_PASSWORD = "SMTPPassword";
Index: lams_flash/src/central/flex/VideoRecorder/src/AddCommentPopUp.mxml
===================================================================
diff -u -r251a00158d63f52d7482fa4aa2decb78d6322a8c -r42aa5319fbd33938828764c43dd0ab1ca80e2416
--- lams_flash/src/central/flex/VideoRecorder/src/AddCommentPopUp.mxml	(.../AddCommentPopUp.mxml)	(revision 251a00158d63f52d7482fa4aa2decb78d6322a8c)
+++ lams_flash/src/central/flex/VideoRecorder/src/AddCommentPopUp.mxml	(.../AddCommentPopUp.mxml)	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
@@ -16,6 +16,10 @@
 		   		this.dictionary = dictionary;
 		   		commentLabel.text = dictionary.getLabelAndConcatenate("videorecorder.comment", [":"]);
 		   		commentInput.text = dictionary.getLabelAndReplace("videorecorder.enter.something.here", ["videorecorder.comment"]);
+		   		cancelButton.label = dictionary.getLabel("button.cancel");
+		   		cancelButton.toolTip = dictionary.getLabel("videorecorder.tooltip.cancel.comment");
+		   		okButton.label = dictionary.getLabel("button.save");
+		   		okButton.toolTip = dictionary.getLabel("videorecorder.tooltip.save.comment");
 		   	}
         ]]>
     </mx:Script>
Index: lams_flash/src/central/flex/VideoRecorder/src/GetRecordingDetailsPopUp.mxml
===================================================================
diff -u -r251a00158d63f52d7482fa4aa2decb78d6322a8c -r42aa5319fbd33938828764c43dd0ab1ca80e2416
--- lams_flash/src/central/flex/VideoRecorder/src/GetRecordingDetailsPopUp.mxml	(.../GetRecordingDetailsPopUp.mxml)	(revision 251a00158d63f52d7482fa4aa2decb78d6322a8c)
+++ lams_flash/src/central/flex/VideoRecorder/src/GetRecordingDetailsPopUp.mxml	(.../GetRecordingDetailsPopUp.mxml)	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
@@ -19,7 +19,8 @@
 		   		descriptionLabel.text = dictionary.getLabelAndConcatenate("videorecorder.description", [":"]);
 		   		titleInput.text = dictionary.getLabelAndReplace("videorecorder.enter.something.here", ["videorecorder.title"]);
 		   		descriptionInput.text = dictionary.getLabelAndReplace("videorecorder.enter.something.here", ["videorecorder.description"]);
-		   		doneButton.label = dictionary.getLabel("button.done");
+		   		doneButton.label = dictionary.getLabel("button.save");
+		   		doneButton.toolTip = dictionary.getLabel("videorecorder.tooltip.save.recording");
 		   	}
 		   	
 		   	public function set dictionary(dictionary:XMLDictionary):void{
@@ -35,8 +36,8 @@
     
 	<mx:Label x="10" y="10" text="Title:" id="titleLabel"/>
 	<mx:Label x="10" y="39" text="Description:" id="descriptionLabel"/>
-	<mx:TextArea x="89" y="38" width="253" height="75" wordWrap="true" editable="true" text="Enter description here" id="descriptionInput"/>
 	<mx:TextInput x="89" y="8" width="253" editable="true" id="titleInput" text="Enter title here"/>
+	<mx:TextArea x="89" y="38" width="253" height="75" wordWrap="true" editable="true" text="Enter description here" id="descriptionInput"/>
 	<mx:ControlBar height="41" y="431">
 		<mx:HBox width="100%" height="100%" horizontalAlign="right">
 			<mx:Button label="Done" id="doneButton" click="dispatchEvent(new Event('popUpClose'))"/>
Index: lams_flash/src/central/flex/VideoRecorder/src/HTTPServices.as
===================================================================
diff -u -r251a00158d63f52d7482fa4aa2decb78d6322a8c -r42aa5319fbd33938828764c43dd0ab1ca80e2416
--- lams_flash/src/central/flex/VideoRecorder/src/HTTPServices.as	(.../HTTPServices.as)	(revision 251a00158d63f52d7482fa4aa2decb78d6322a8c)
+++ lams_flash/src/central/flex/VideoRecorder/src/HTTPServices.as	(.../HTTPServices.as)	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
@@ -6,6 +6,7 @@
 	videoRecorderActions.resultFormat = "e4x";
 	videoRecorderActions.request.method = "getRecordingsByToolSessionIdAndUserId";
 	videoRecorderActions.request.toolSessionId = toolSessionId;
+	videoRecorderActions.request.toolContentId = toolContentId;
 	videoRecorderActions.request.userId = userId;
 	
 	if(allowLearnerVideoVisibility || mode == "teacher")
@@ -52,6 +53,9 @@
 	else
 		videoRecorderActions.request.isJustSound = false;
 	
+	videoRecorderActions.request.toolContentId = -1;
+	videoRecorderActions.request.saveToLams = false;
+	
 	videoRecorderActions.request.toolSessionId = toolSessionId;
 	videoRecorderActions.addEventListener(ResultEvent.RESULT, saveRecordingSuccessHandler);
 	videoRecorderActions.addEventListener(FaultEvent.FAULT, saveRecordingFaultHandler);
@@ -136,6 +140,9 @@
 	// set the user's voted value
 	ratingClicked.votedValue = e.result.userRating;
 	
+	// fix the tooltip
+	ratingClicked.toolTip = dictionary.getLabelAndConcatenate("videorecorder.tooltip.already.rated", [" ", String(e.result.userRating)]);
+
 	// update the video recordings
 	getRecordingsFromServer(sortButtonGroup.sortBy, sortButtonGroup.sortDirection);	
 }
Index: lams_flash/src/central/flex/VideoRecorder/src/VideoInformation.mxml
===================================================================
diff -u -r251a00158d63f52d7482fa4aa2decb78d6322a8c -r42aa5319fbd33938828764c43dd0ab1ca80e2416
--- lams_flash/src/central/flex/VideoRecorder/src/VideoInformation.mxml	(.../VideoInformation.mxml)	(revision 251a00158d63f52d7482fa4aa2decb78d6322a8c)
+++ lams_flash/src/central/flex/VideoRecorder/src/VideoInformation.mxml	(.../VideoInformation.mxml)	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
@@ -5,27 +5,35 @@
 			import org.lamsfoundation.lams.common.dictionary.XMLDictionary;
 			import mx.core.Application;
 			
-			private var allowRatings:Boolean;
-			private var allowComments:Boolean;
-			private var dictionary:XMLDictionary;
+			public var allowRatings:Boolean;
+			public var allowComments:Boolean;
+			public var dictionary:XMLDictionary;
 			
-			public function init():void{
-				allowRatings = Application.application.getAllowRatings();
-				allowComments = Application.application.getAllowComments();
-				dictionary = Application.application.getDictionary();
-				
+			public function init():void{			
 				// enable/disable ratings
 				if(!allowRatings)
 					authorBox.removeChild(authorBox.getChildByName("ratingsBox"));
 				
 				// enable/disable comments
 				if(!allowComments)
 					videoInformationBox.removeChild(videoInformationBox.getChildByName("commentsBox")); 
+					
+				enableVideoInformationButtons(false);
+				resetInformation();
 			}
 			
 			public function enableVideoInformationButtons(enabled:Boolean):void{
 				ratingButton.enabled = enabled;
 				addCommentButton.enabled = enabled;
+				
+				if(enabled){
+					addCommentButton.toolTip = dictionary.getLabel("videorecorder.tooltip.add.comment");
+					ratingButton.toolTip = dictionary.getLabel("videorecorder.tooltip.rate.recording");
+				}
+				else{
+					addCommentButton.toolTip = dictionary.getLabelAndConcatenate("videorecorder.tooltip.add.comment", [" (", dictionary.getLabel("videorecorder.disabled"), ")"]);
+					ratingButton.toolTip = dictionary.getLabelAndConcatenate("videorecorder.tooltip.rate.recording", [" (", dictionary.getLabel("videorecorder.disabled"), ")"]);
+				}
 			}
 		
 			public function printComments(comments:XMLList):void{
@@ -54,7 +62,8 @@
 				ratingButton.value = 0;
 				ratingButton.votedValue = 0;
 				ratingButton.enabled = false;
-				addCommentButton.enabled = false;	
+				addCommentButton.enabled = false;
+				addCommentButton.toolTip = dictionary.getLabelAndConcatenate("videorecorder.tooltip.add.comment", [" (", dictionary.getLabel("videorecorder.disabled"), ")"]);
 			}
 	    ]]>
 	</mx:Script>
Index: lams_flash/src/central/flex/VideoRecorder/src/VideoProfile.mxml
===================================================================
diff -u -r251a00158d63f52d7482fa4aa2decb78d6322a8c -r42aa5319fbd33938828764c43dd0ab1ca80e2416
--- lams_flash/src/central/flex/VideoRecorder/src/VideoProfile.mxml	(.../VideoProfile.mxml)	(revision 251a00158d63f52d7482fa4aa2decb78d6322a8c)
+++ lams_flash/src/central/flex/VideoRecorder/src/VideoProfile.mxml	(.../VideoProfile.mxml)	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
@@ -2,21 +2,30 @@
 <mx:Canvas xmlns:mx="http://www.adobe.com/2006/mxml" width="290" height="115" verticalScrollPolicy="off" horizontalScrollPolicy="off" creationComplete="init()">
 	<mx:Script>
 		<![CDATA[
+			import org.lamsfoundation.lams.common.dictionary.XMLDictionary;
 			import mx.core.Application;
-		
-			private function init():void{
-				var userId:int = Application.application.getUserId();
-				var allowLearnerVideoExport:Boolean = Application.application.getAllowLearnerVideoExport();
-				var allowLearnerVideoVisibility:Boolean = Application.application.getAllowLearnerVideoVisibility();
-				var mode:String = Application.application.getMode();
-				
-				if(mode == Application.application.LEARNER_MODE)
-					if(data.userUid != userId)
+			
+			public var userId:int;
+			public var allowLearnerVideoExport:Boolean;
+			public var allowLearnerVideoVisibility:Boolean;
+			public var mode:String;
+			public var dictionary:XMLDictionary;
+			
+			private function init():void{	
+				// if in learner mode		
+				if(mode == Application.application.LEARNER_MODE){
+					// if recording doesn't belong to logged user
+					if(data.userUid != userId){
+						// remove button
 						videoProfileButtonBox.removeChild(videoProfileButtonBox.getChildByName("deleteButton"));
-				
-				if(mode == Application.application.LEARNER_MODE)
-					if(data.userUid != userId || !allowLearnerVideoExport)
-						videoProfileButtonBox.removeChild(videoProfileButtonBox.getChildByName("exportButton"));
+					}
+					// otherwise
+					else{
+						// add a tooltooltip
+						if(dictionary)
+							deleteButton.toolTip = dictionary.getLabel("videorecorder.tooltip.delete.recording");
+					}
+				}
 			}
 		
 	    ]]>
@@ -33,7 +42,7 @@
 		</mx:HBox>
 		<mx:HBox width="100%" height="100%" paddingTop="0" paddingRight="5" paddingLeft="5" paddingBottom="5" verticalAlign="middle" horizontalScrollPolicy="off" verticalScrollPolicy="off" id="videoProfileButtonBox">
 			<mx:Button icon="@Embed(source='assets/images/deleteIcon.swf')" width="25" height="20" id="deleteButton"/>
-			<mx:Button icon="@Embed(source='assets/images/exportIcon.swf')" width="25" height="20" id="exportButton"/>
+			<mx:Button icon="@Embed(source='assets/images/exportIcon.swf')" width="25" height="20" id="exportButton" visible="false"/>
 		</mx:HBox>
 	</mx:VBox>
 </mx:Canvas>
Index: lams_flash/src/central/flex/VideoRecorder/src/VideoRecorder.mxml
===================================================================
diff -u -r251a00158d63f52d7482fa4aa2decb78d6322a8c -r42aa5319fbd33938828764c43dd0ab1ca80e2416
--- lams_flash/src/central/flex/VideoRecorder/src/VideoRecorder.mxml	(.../VideoRecorder.mxml)	(revision 251a00158d63f52d7482fa4aa2decb78d6322a8c)
+++ lams_flash/src/central/flex/VideoRecorder/src/VideoRecorder.mxml	(.../VideoRecorder.mxml)	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml" layout="absolute" width="682" backgroundGradientAlphas="[1.0, 1.0]" backgroundGradientColors="[#FFFFFF, #FFFFFF]" xmlns:ns1="org.lamsfoundation.lams.common.ui.components.*" xmlns:controls="com.asfusion.controls.*" height="652" creationComplete="init()" enabled="true" xmlns:local="*" xmlns:ns2="org.lamsfoundation.lams.common.ui.components.*">
+<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:Script>
 		<![CDATA[
+			import org.lamsfoundation.lams.common.util.ArgumentsToRendererFactory;
 			import org.lamsfoundation.lams.common.util.VideoDisplayUtil;
 			//includes
 			include "HTTPServices.as"
@@ -19,7 +20,7 @@
 			import com.asfusion.controls.Rating;
 			import com.asfusion.controls.ratingclasses.RatingEvent;
 			import mx.collections.ArrayCollection;
-			import mx.events.MetadataEvent;		
+			import mx.events.MetadataEvent;	
 			import mx.containers.TitleWindow;
 			import mx.rpc.events.FaultEvent;
 			import mx.controls.Alert;
@@ -36,13 +37,16 @@
 			private var client:Object;
 			private var cam:Camera = null;
 			private var mic:Microphone = null;
+			
+			// static strings
 			private static var red5App:String = "oflaDemo";
 			private static var servletLocation:String = "tool/lavidr10/videoRecorderActions.do";
 					
 			// from flashvars
 			[Bindable] private var contentEditable:Boolean;
 			[Bindable] private var userId:int;
 			[Bindable] private var toolSessionId:int;
+			[Bindable] private var toolContentId:int;
 			[Bindable] private var allowUseVoice:Boolean;
 			[Bindable] private var allowUseCamera:Boolean;
 			[Bindable] private var allowLearnerVideoVisibility:Boolean;
@@ -56,26 +60,26 @@
 
 			// misc
 			private var filename:String = "";
-			private var itemClicked:Object = null;
+			[Bindable] private var itemClicked:Object = null;
 			private var ratingClicked:Rating;
-			private var dictionary:XMLDictionary;
+			[Bindable] private var dictionary:XMLDictionary;
 			[Bindable] private var videoRecordings:XMLList = null;
-			private var timer:Timer;
+			private var playTimer:Timer;
+			private var recTimer:Timer;
 			private var metadata:Object;
 			
 			// ui stuff
 			private var getDetailsPopUp:GetRecordingDetailsPopUp;
 			private var addCommentPopUp:AddCommentPopUp;
-			
 			private var previewImage:BitmapData;
 			
 			// constants
 			public const TEACHER_MODE:String = "teacher";
 			public const AUTHOR_MODE:String = "author";
 			public const LEARNER_MODE:String = "learner";
 							
-			// called from creationComplete
-			private function init():void {
+			// called from preinitialize
+			private function onPreinitialize(event:Event):void {
 				// get flashvars
 				getFlashVars();
 								
@@ -88,27 +92,16 @@
 					allowUseCamera = true;
 					allowUseVoice = true;	
 				}
-				
-				// init labels if languageXML is not empty
-				if(languageXML.toString() != ""){
-					dictionary = new XMLDictionary(languageXML);
-					setLabels();
-				}
-				else{
-					dictionary = new XMLDictionary(new XML(""));
-				}
-				
-				// add some listeners
-				addListeners();
-				
+								
 				// for testing purposes (when running in debug)
 				if(toolSessionId == 0){
 					contentEditable = true;
 					userId = 1;
-					toolSessionId = 1;
+					toolSessionId = 4;
+					toolContentId = 1;
 					allowUseVoice = true;
-					allowUseCamera = true;
-					allowComments = true;
+					allowUseCamera = false;
+					allowComments = false;
 					allowRatings = true;
 					allowLearnerVideoExport = false;
 					allowLearnerVideoVisibility = true;
@@ -122,6 +115,7 @@
 					"contentEditable: " + contentEditable +
 					"\nuserId: " + userId +
 					"\ntoolSessionId: " + toolSessionId +
+					"\ntoolContentId: " + toolContentId +
 					"\nallowUseVoice: " + allowUseVoice +
 					"\nallowUseCamera: " + allowUseCamera +
 					"\nallowLearnerVideoVisibility: " + allowLearnerVideoVisibility +
@@ -132,7 +126,23 @@
 					"\nserverUrl: " + serverUrl +
 					"\nmode: " + mode);
 				*/
+			}
+			
+			// called from applicationComplete
+			private function onApplicationComplete(event:Event):void {
+				// init labels if languageXML is not empty
+				if(languageXML.toString() != ""){
+					dictionary = new XMLDictionary(languageXML);
+					setLabels();
+					setTooltips();
+				}
+				else{
+					dictionary = new XMLDictionary(new XML(""));
+				}
 				
+				// add some listeners
+				addListeners();
+				
 				// add the app name to the red5 url to complete the url
 				red5ServerUrl += red5App;
 				
@@ -164,10 +174,21 @@
 					videoList.setStyle("bottom", 10);
 					videoList.invalidateList();
 				}
+				else{
+					if(!isWebcamInfoSet())
+					{
+						Security.showSettings();
+						setWebcamInfo(true);
+					}
+				}
 				
 				// init components that need it
 				videoInformation.init();
-								
+				
+				// disable playback buttons and enable the video list
+				enablePlaybackButtons(false);
+				enableVideoList(true);
+				
 				// create the connection
 				createConnection();
 			}
@@ -179,6 +200,7 @@
 				contentEditable = LAMSStringUtil.stringToBool(Application.application.parameters.contentEditable);
 				userId = Application.application.parameters.userId;
 				toolSessionId = Application.application.parameters.toolSessionId;
+				toolContentId = Application.application.parameters.toolContentId;
 				allowUseVoice = LAMSStringUtil.stringToBool(Application.application.parameters.allowUseVoice);
 				allowUseCamera = LAMSStringUtil.stringToBool(Application.application.parameters.allowUseCamera);
 				allowLearnerVideoVisibility = LAMSStringUtil.stringToBool(Application.application.parameters.allowLearnerVideoVisibility);
@@ -189,9 +211,10 @@
 				mode = Application.application.parameters.mode;
 			}
 			
-			// sets labels
+			// sets initial labels
 			private function setLabels():void{
 				playButton.label = dictionary.getLabel("videorecorder.play");
+				refreshButton.label = dictionary.getLabel("videorecorder.refresh");
 				sortAuthorButton.label = dictionary.getLabel("videorecorder.author");
 				sortByLabel.text = dictionary.getLabelAndConcatenate("videorecorder.sort.by", [":"]);
 				sortDateButton.label = dictionary.getLabel("videorecorder.date");
@@ -203,11 +226,26 @@
 				videoInformation.ratingLabel.text = dictionary.getLabelAndConcatenate("videorecorder.rating", [":"]);
 				videoInformation.descriptionLabel.text = dictionary.getLabelAndConcatenate("videorecorder.description", [":"]);
 				videoInformation.commentsLabel.text = dictionary.getLabelAndConcatenate("videorecorder.comment", ["s:"]);
+				videoInformation.addCommentButton.label = dictionary.getLabel("videorecorder.add.comment");
 				startRecButton.label = dictionary.getLabel("videorecorder.start.recording");
 				viewCameraButton.label = dictionary.getLabel("videorecorder.view.camera");
 				videoRecorderPanel.status = dictionary.getLabel("videorecorder.waiting");
 			}
 			
+			// sets initial tooltips
+			private function setTooltips():void{
+				playButton.toolTip = dictionary.getLabelAndConcatenate("videorecorder.tooltip.play", [" (", dictionary.getLabel("videorecorder.disabled"), ")"]);
+				refreshButton.toolTip = dictionary.getLabelAndConcatenate("videorecorder.tooltip.refresh", [" (", dictionary.getLabel("videorecorder.disabled"), ")"]);
+				sortAuthorButton.toolTip = dictionary.getLabelAndConcatenate("videorecorder.tooltip.sort.author", [" (", dictionary.getLabel("videorecorder.disabled"), ")"]);
+				sortDateButton.toolTip = dictionary.getLabelAndConcatenate("videorecorder.tooltip.sort.date", [" (", dictionary.getLabel("videorecorder.disabled"), ")"]);
+				sortTitleButton.toolTip = dictionary.getLabelAndConcatenate("videorecorder.tooltip.sort.title", [" (", dictionary.getLabel("videorecorder.disabled"), ")"]);
+				viewCameraButton.toolTip = dictionary.getLabel("videorecorder.tooltip.start.camera");
+				startRecButton.toolTip = dictionary.getLabel("videorecorder.tooltip.start.recording");
+				
+				videoInformation.addCommentButton.toolTip = dictionary.getLabelAndConcatenate("videorecorder.tooltip.add.comment", [" (", dictionary.getLabel("videorecorder.disabled"), ")"]);
+				videoInformation.ratingButton.toolTip = dictionary.getLabelAndConcatenate("videorecorder.tooltip.rate.recording", [" (", dictionary.getLabel("videorecorder.disabled"), ")"]);
+			}
+			
 			// adds listeners
 			private function addListeners():void{
 				videoInformation.ratingButton.addEventListener(RatingEvent.SELECTION_CHANGE, addRatingClick);
@@ -230,6 +268,25 @@
 				videoDisplay.addEventListener(VideoDisplayEvent.COMPLETE, onComplete);
 			}
 			
+			// checks for previous webcam info
+			private function isWebcamInfoSet():Boolean{
+				var lamsVideoRecorderInfo:Object = SharedObject.getLocal("lamsWebcamInfo");
+				
+				if(lamsVideoRecorderInfo.data.webcamSet){
+					return lamsVideoRecorderInfo.data.webcamSet;
+				}else{
+					return false;
+				}
+					
+			}
+			
+			// sets webcam info
+			private function setWebcamInfo(checked:Boolean):void{
+				var lamsVideoRecorderInfo:Object = SharedObject.getLocal("lamsWebcamInfo");
+				lamsVideoRecorderInfo.data.webcamSet = checked;
+			}
+			
+			// creates connection to red5 server
 			private function createConnection():void{
 				// create basic netConnection object
 				nc = new NetConnection();
@@ -285,10 +342,12 @@
 				}
 			}
 			
+			// netconnection security error handler
 			private function securityErrorHandler(event:SecurityErrorEvent):void {
 				trace("securityErrorHandler: " + event);
 			}
-	
+			
+			// netconnection async error handler
 			private  function asyncErrorHandler(event:AsyncErrorEvent):void {
 				trace("securityErrorHandler: " + event);
 			} 
@@ -298,7 +357,8 @@
 				// print its properties
     			Application.application.printInfoObject("onBWDone", infoObject)
 			}
-	
+			
+			// handler to sort and update recordings
         	private function sortRecordingsHandler(event:SortEvent):void{
         		getRecordingsFromServer(sortButtonGroup.sortBy, sortButtonGroup.sortDirection);	
         	}
@@ -334,17 +394,26 @@
         		}
         	}
 			
+			// view camera click handler
 			private function viewCameraClick(event:MouseEvent):void{
-				if(!videoDisplay.isCameraViewed)
+				if(!videoDisplay.isCameraViewed){
+					// reset the video display
+					videoDisplay.reset();
+					
+					// start the camera
 					videoDisplay.startViewCamera();
-				else if(videoDisplay.isCameraViewed)
+				}
+				else if(videoDisplay.isCameraViewed){
 					videoDisplay.stopViewCamera();
+				}
 			}
 			
+			// play click handler
 			private function playClick(event:MouseEvent):void{
 				videoDisplay.play();
 			}
 			
+			// recording click handler
 			private function startRecordingClick(event:MouseEvent):void{
 				if(!videoDisplay.isPublishing){
 					filename = VideoDisplayUtil.createFilename(toolSessionId, userId);
@@ -354,13 +423,15 @@
 					videoDisplay.stopPublish();
 			}
 			
+			// add comment click handler
 			private function addCommentClick(event:MouseEvent):void{
 				addCommentPopUp = AddCommentPopUp(PopUpManager.createPopUp(this, AddCommentPopUp, true));
 				PopUpManager.centerPopUp(addCommentPopUp);
 				addCommentPopUp.init(dictionary);
 				addCommentPopUp.addEventListener("popUpClose", popUpRemovedHandler);
 			}
 			
+			// add rating click handler
 			private function addRatingClick(event:RatingEvent):void{
 				if(!Rating(event.currentTarget).voted){
 					var recordingId:int = itemClicked.recordingId;
@@ -372,12 +443,14 @@
 				}
 			}
 			
+			// delete recording click handler
 			private function deleteClick(event:MouseEvent):void{
 				if(event.target.hasOwnProperty("id") && event.target.id == "deleteButton"){
 					Alert.show(dictionary.getLabel("videorecorder.message.sure.delete"), dictionary.getLabel("videorecorder.confirm"), 3, this, confirmDeleteClick);  
 				}
 			}
 			
+			// confirm delete click handler
 			private function confirmDeleteClick(event:CloseEvent):void{
 				if (event.detail==Alert.YES){
 					var recordingId:int = itemClicked.recordingId;
@@ -409,14 +482,28 @@
 					videoInformation.ratingButton.value = itemClicked.rating;
 					videoInformation.printComments(itemClicked.comments);
 					
+					videoInformation.addCommentButton.toolTip = dictionary.getLabel("videorecorder.tooltip.add.comment");
+					
+					// show/hide ratings and comments depending on toolContentId status
+					if(LAMSStringUtil.stringToBool(itemClicked.isToolContent)){
+						videoInformation.ratingsBox.visible = false;
+						videoInformation.commentsBox.visible = false;
+					}
+					else{
+						videoInformation.ratingsBox.visible = true;
+						videoInformation.commentsBox.visible = true;
+					}
+					
 					// if no vote has been done, enable voting and show average
 					if(itemClicked.userRating == -1){
 						videoInformation.ratingButton.voted = false;
+						videoInformation.ratingButton.toolTip = dictionary.getLabel("videorecorder.tooltip.rate.recording");
 					}
 					// if vote has been done, show user's vote and disable voting
 					else{
 						videoInformation.ratingButton.voted = true;
 						videoInformation.ratingButton.votedValue = itemClicked.userRating;
+						videoInformation.ratingButton.toolTip = dictionary.getLabelAndConcatenate("videorecorder.tooltip.already.rated", [" ", String(itemClicked.userRating)]);
 					}
 					
 					// make ready item clickedo
@@ -429,6 +516,7 @@
 				}
 			}
 			
+			// makes the clicked item ready with the video display
 			private function makeReadytItemClicked():void{
 				// if playing a sound file
 				if(LAMSStringUtil.stringToBool(itemClicked.isJustSound)){
@@ -447,40 +535,24 @@
 				seekSlider.minimum = 0;
 				seekSlider.maximum = event.metadata.duration;
 				
-				timer = new Timer(10);
-				timer.addEventListener(TimerEvent.TIMER, updateSeekSlider);
-				timer.start();
+				playTimer = new Timer(10);
+				playTimer.addEventListener(TimerEvent.TIMER, updateSeekSlider);
+				playTimer.start();
 			}
 			
 			// onReady callback, called from videoDisplay
 			private function onReady(event:VideoDisplayEvent):void{
-				playButton.enabled = true;
-				seekSlider.enabled = true;
-				playButton.label = dictionary.getLabel("videorecorder.play");
+				enablePlaybackButtons(true);
 				videoRecorderPanel.status = dictionary.getLabel("videorecorder.ready");
 			}
 			
 			// onReset callback, called from videoDisplay
 			public function onReset(event:VideoDisplayEvent):void{
 				// reset play buttons
-				playButton.enabled = false;
-				playButton.label = dictionary.getLabel("videorecorder.play");
+				enablePlaybackButtons(false);
 				
 				// set panel status label
 				videoRecorderPanel.status = dictionary.getLabel("videorecorder.waiting");
-				
-				// if a timer exists, clear it
-				if(timer){
-					timer.stop();
-					timer = null;
-				}
-
-				seekSlider.enabled = false;
-				seekSlider.minimum = 0;
-				seekSlider.maximum = 0;
-				seekSlider.value = seekSlider.minimum;
-				
-				timerLabel.text = "0:00 / 0:00";
 			}
 			
 			// onUnpause callback, called from videoDisplay
@@ -489,6 +561,7 @@
 				videoRecorderPanel.status = dictionary.getLabel("videorecorder.playing");
 				
 				playButton.label = dictionary.getLabel("videorecorder.pause");
+				playButton.toolTip = dictionary.getLabel("videorecorder.tooltip.pause");
 			}
 			
 			// onPause callback, called from videoDisplay
@@ -497,39 +570,55 @@
 				videoRecorderPanel.status = dictionary.getLabel("videorecorder.paused");
 				
 				playButton.label = dictionary.getLabel("videorecorder.resume");
+				playButton.toolTip = dictionary.getLabel("videorecorder.tooltip.resume");
 			}
 			
+			// onStartPublish callback, called from videoDisplay
 			private function onStartPublish(event:VideoDisplayEvent):void{
 				// set panel status label
 				videoRecorderPanel.status = dictionary.getLabel("videorecorder.recording");
 				
 				// change the start recording button's label
 				startRecButton.label = dictionary.getLabel("videorecorder.stop.recording");
+				startRecButton.toolTip = dictionary.getLabel("videorecorder.tooltip.stop.recording");
 				
 				viewCameraButton.enabled = false;
+				viewCameraButton.label = dictionary.getLabel("videorecorder.view.camera");
+				viewCameraButton.toolTip = dictionary.getLabelAndConcatenate("videorecorder.tooltip.start.camera", [" (", dictionary.getLabel("videorecorder.disabled"), ")"]);
+				
+				recTimer = new Timer(250);
+				recTimer.addEventListener(TimerEvent.TIMER, updateTimerLabelForRecording);
+				recTimer.start();
 			}
 			
+			// onStopPublish callback, called from videoDisplay
 			private function onStopPublish(event:VideoDisplayEvent):void{		
 				// change the start recording button's label
 				startRecButton.label = dictionary.getLabel("videorecorder.start.recording");
+				startRecButton.toolTip = dictionary.getLabel("videorecorder.tooltip.start.recording");
 				
 				// set panel status label
 				videoRecorderPanel.status = dictionary.getLabel("videorecorder.waiting");
 				
 				viewCameraButton.enabled = true;
+				viewCameraButton.toolTip = dictionary.getLabel("videorecorder.tooltip.start.camera");
 				
 				getDetailsPopUp = GetRecordingDetailsPopUp(PopUpManager.createPopUp(this, GetRecordingDetailsPopUp, true));
 				PopUpManager.centerPopUp(getDetailsPopUp);
 				getDetailsPopUp.init(dictionary);
 				getDetailsPopUp.addEventListener("popUpClose", popUpRemovedHandler);
+				
+				recTimer.stop();
 			}
 			
-			private function onStartCamera(event:VideoDisplayEvent):void{
+			// onStartCamera callback, called from videoDisplay
+			private function onStartCamera(event:VideoDisplayEvent):void{				
 				// reset video information
 				videoInformation.resetInformation();
 				
 				// change the view camera button's label
 				viewCameraButton.label = dictionary.getLabel("videorecorder.stop.camera");
+				viewCameraButton.toolTip = dictionary.getLabel("videorecorder.tooltip.stop.camera");
 				
 				// set panel status label
 				videoRecorderPanel.status = dictionary.getLabel("videorecorder.waiting");
@@ -539,11 +628,12 @@
 				videoInformation.enableVideoInformationButtons(false);
 			}
 			
+			// onStopCamera callback, called from videoDisplay
 			private function onStopCamera(event:VideoDisplayEvent):void{
 				// change the view camera button's label
 				viewCameraButton.label = dictionary.getLabel("videorecorder.view.camera");
+				viewCameraButton.toolTip = dictionary.getLabel("videorecorder.tooltip.start.camera");
 				
-				
 				// set panel status label
 				videoRecorderPanel.status = dictionary.getLabel("videorecorder.waiting");
 				
@@ -555,27 +645,34 @@
 				enablePlaybackButtonsAndVideoList(true);
 			}
 			
+			// onComplete callback, called from videoDisplay
 			private function onComplete(event:VideoDisplayEvent):void{
+				// set panel status label
+				videoRecorderPanel.status = dictionary.getLabel("videorecorder.ready");
+				
+				// reset play button labels
 				playButton.label = dictionary.getLabel("videorecorder.play");
+				playButton.toolTip = dictionary.getLabel("videorecorder.tooltip.play");
 			}
 			
+			// seeks to the given location of recording
 			private function seekSliderChange(event:SliderEvent):void {
 				videoDisplay.seek(event.value);
 			}
 			
+			// seek slider click handler
 			private function seekSliderClick(event:SliderEvent):void {
 				// if seekslider is enabled
-				
 				if(seekSlider.enabled){
 					// if the mouse is pressed
 					if(event.type == SliderEvent.THUMB_PRESS){
 						// stop the timer so that the bar seekSlider can manually be controlled
-						timer.stop();
+						playTimer.stop();
 					}
 					// if the mouse is released
 					else if(event.type == SliderEvent.THUMB_RELEASE){
 						// start the timer again and allow it to regain control of the seekSlider
-						timer.start();
+						playTimer.start();
 					}
 				}
 			}
@@ -593,7 +690,13 @@
 					timerLabel.text = VideoDisplayUtil.secondsToString(String(videoDisplay.time)) + " / " + VideoDisplayUtil.secondsToString(String(videoDisplay.duration));					
 				}
 			}
-				        	       	
+			
+			// updates timerLabel when recording
+			private function updateTimerLabelForRecording(event:TimerEvent):void{
+				var timer:Timer = Timer(event.currentTarget);
+				timerLabel.text = VideoDisplayUtil.secondsToString(String(timer.currentCount * timer.delay / 1000));
+			}
+			   	       	
 	       	// enables/disables the playback related buttons and video list
 			private function enablePlaybackButtonsAndVideoList(enabled:Boolean):void{
 				enablePlaybackButtons(enabled);
@@ -602,8 +705,34 @@
 	        
 	        // enables/disables the playback related buttons
 	        private function enablePlaybackButtons(enabled:Boolean):void{
+	        	var trueEnable:Boolean = enabled && itemClicked != null;
+	        	
+	        	// play button stuff
 	        	playButton.label = dictionary.getLabel("videorecorder.play");
-				playButton.enabled = (enabled && itemClicked != null);
+	        	
+				playButton.enabled = trueEnable;
+				
+				if(trueEnable)
+					playButton.toolTip = dictionary.getLabel("videorecorder.tooltip.play");
+				else
+					playButton.toolTip = dictionary.getLabelAndConcatenate("videorecorder.tooltip.play", [" (", dictionary.getLabel("videorecorder.disabled"), ")"]);
+				
+				// seekslider stuff
+				seekSlider.enabled = trueEnable;
+				
+				if(!trueEnable){
+					// if a timer exists, clear it
+					if(playTimer){
+						playTimer.stop();
+						playTimer = null;
+					}
+					
+					seekSlider.minimum = 0;
+					seekSlider.maximum = 0;
+					seekSlider.value = seekSlider.minimum;
+					
+					timerLabel.text = "0:00 / 0:00";
+				}
 	        }
 	        
 	        // enables/disables the video list
@@ -614,6 +743,19 @@
 				sortAuthorButton.enabled = enabled;
 				sortTitleButton.enabled = enabled;
 				
+				if(enabled){
+					refreshButton.toolTip = dictionary.getLabel("videorecorder.tooltip.refresh");
+					sortAuthorButton.toolTip = dictionary.getLabel("videorecorder.tooltip.sort.author");
+					sortDateButton.toolTip = dictionary.getLabel("videorecorder.tooltip.sort.date");
+					sortTitleButton.toolTip = dictionary.getLabel("videorecorder.tooltip.sort.title");
+				}
+				else{
+					refreshButton.toolTip = dictionary.getLabelAndConcatenate("videorecorder.tooltip.refresh", [" (", dictionary.getLabel("videorecorder.disabled"), ")"]);
+					sortAuthorButton.toolTip = dictionary.getLabelAndConcatenate("videorecorder.tooltip.sort.author", [" (", dictionary.getLabel("videorecorder.disabled"), ")"]);
+					sortDateButton.toolTip = dictionary.getLabelAndConcatenate("videorecorder.tooltip.sort.date", [" (", dictionary.getLabel("videorecorder.disabled"), ")"]);
+					sortTitleButton.toolTip = dictionary.getLabelAndConcatenate("videorecorder.tooltip.sort.title", [" (", dictionary.getLabel("videorecorder.disabled"), ")"]);
+				}
+				
 				// if videoRecordings is defined
 				if(videoRecordings){
 					var length:int = videoRecordings.length();
@@ -624,11 +766,25 @@
 						var deleteButton:Button = videoProfile.deleteButton;
 						var exportButton:Button = videoProfile.exportButton;
 						
-						if(deleteButton)
+						if(deleteButton){
 							deleteButton.enabled = enabled;
+							
+							if(enabled)
+								deleteButton.toolTip = dictionary.getLabel("videorecorder.tooltip.delete.recording");
+							else
+								deleteButton.toolTip = dictionary.getLabelAndConcatenate("videorecorder.tooltip.delete.recording", [" (", dictionary.getLabel("videorecorder.disabled"), ")"]);
+						}
+							
 						
-						if(exportButton)
+						if(exportButton){
 							exportButton.enabled = enabled;
+							
+							if(enabled)
+								exportButton.toolTip = dictionary.getLabel("videorecorder.tooltip.export.recording");
+							else
+								exportButton.toolTip = dictionary.getLabelAndConcatenate("videorecorder.tooltip.export.recording", [" (", dictionary.getLabel("videorecorder.disabled"), ")"]);
+						}
+							
 					}
 				}    	
 	        }
@@ -673,11 +829,11 @@
 	</mx:ControlBar>
 	</mx:Panel>
 	<mx:Label id="videoInformationLabel" x="10" y="328" text="Video information:" fontWeight="bold"/>
-	<local:VideoInformation id="videoInformation"/>
+	<local:VideoInformation id="videoInformation" allowComments="{allowComments}" allowRatings="{allowRatings}" dictionary="{dictionary}"/>
 	<mx:HBox left="358" top="10" right="10">
 		<mx:Label id="videosLabel" text="Videos:" fontWeight="bold"/>
 	</mx:HBox>
-	<mx:TileList borderStyle="none" id="videoList" itemRenderer="VideoProfile" dataProvider="{videoRecordings}" paddingLeft="0" paddingRight="0" paddingTop="0" paddingBottom="0" itemClick="videoListClick(event)" top="62" left="358" bottom="70" right="10"></mx:TileList>
+	<mx:TileList borderStyle="none" id="videoList" itemRenderer="{new ArgumentsToRendererFactory({userId:this.userId, allowLearnerVideoExport:this.allowLearnerVideoExport, allowLearnerVideoVisibility:this.allowLearnerVideoVisibility, mode:this.mode, dictionary:this.dictionary},VideoProfile)}" dataProvider="{videoRecordings}" paddingLeft="0" paddingRight="0" paddingTop="0" paddingBottom="0" itemClick="videoListClick(event)" top="62" left="358" bottom="70" 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">
Index: lams_flash/src/central/flex/VideoRecorderFCKEditor/.project
===================================================================
diff -u -r251a00158d63f52d7482fa4aa2decb78d6322a8c -r42aa5319fbd33938828764c43dd0ab1ca80e2416
--- lams_flash/src/central/flex/VideoRecorderFCKEditor/.project	(.../.project)	(revision 251a00158d63f52d7482fa4aa2decb78d6322a8c)
+++ lams_flash/src/central/flex/VideoRecorderFCKEditor/.project	(.../.project)	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
@@ -17,6 +17,11 @@
 	</natures>
 	<linkedResources>
 		<link>
+			<name>bin-release1</name>
+			<type>2</type>
+			<location>D:/LAMS_HEAD/lams_central/web/fckeditor/editor/plugins/videorecorder</location>
+		</link>
+		<link>
 			<name>[source path] flex</name>
 			<type>2</type>
 			<location>D:/LAMS_HEAD/lams_flash/src/common/flex</location>
Index: lams_flash/src/central/flex/VideoRecorderFCKEditor/src/GetRecordingDetailsPopUp.mxml
===================================================================
diff -u
--- lams_flash/src/central/flex/VideoRecorderFCKEditor/src/GetRecordingDetailsPopUp.mxml	(revision 0)
+++ lams_flash/src/central/flex/VideoRecorderFCKEditor/src/GetRecordingDetailsPopUp.mxml	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<mx:TitleWindow xmlns:mx="http://www.adobe.com/2006/mxml" layout="absolute" width="310" height="174" title="New Recording Details">
+
+	<mx:Script>
+        <![CDATA[
+        	import org.lamsfoundation.lams.common.dictionary.XMLDictionary;       
+            import mx.managers.PopUpManager;
+	       	
+	       	private var _dictionary:XMLDictionary;
+	       		
+		   	private function initApp():void{
+		   		this.focusManager.setFocus(titleInput);
+		   	}
+		   	
+		   	public function init(dictionary:XMLDictionary):void{
+		   		this._dictionary = dictionary;
+		   		this.title = dictionary.getLabel("videorecorder.new.recording.details");
+		   		titleLabel.text = dictionary.getLabelAndConcatenate("videorecorder.title", [":"]);
+		   		descriptionLabel.text = dictionary.getLabelAndConcatenate("videorecorder.description", [":"]);
+		   		titleInput.text = dictionary.getLabelAndReplace("videorecorder.enter.something.here", ["videorecorder.title"]);
+		   		descriptionInput.text = dictionary.getLabelAndReplace("videorecorder.enter.something.here", ["videorecorder.description"]);
+		   		doneButton.label = dictionary.getLabel("button.save");
+				doneButton.toolTip = dictionary.getLabel("videorecorder.tooltip.save.recording");
+		   	}
+		   	
+		   	public function set dictionary(dictionary:XMLDictionary):void{
+		   		_dictionary = dictionary;
+		   	}
+		   	
+		   	public function get dictionary():XMLDictionary{
+		   		return _dictionary;
+		   	}
+		   	
+        ]]>
+    </mx:Script>
+    
+	<mx:Label x="10" y="10" text="Title:" id="titleLabel"/>
+	<mx:Label x="10" y="39" text="Description:" id="descriptionLabel"/>
+	<mx:TextInput x="89" y="8" width="191" editable="true" id="titleInput" text="Enter title here"/>
+	<mx:TextArea x="89" y="38" width="191" height="53" wordWrap="true" editable="true" text="Enter description here" id="descriptionInput"/>
+	<mx:ControlBar height="41" y="431">
+		<mx:HBox width="100%" height="100%" horizontalAlign="right">
+			<mx:Button label="Done" id="doneButton" click="dispatchEvent(new Event('popUpClose'))" enterState=""/>
+		</mx:HBox>
+	</mx:ControlBar>
+</mx:TitleWindow>
Index: lams_flash/src/central/flex/VideoRecorderFCKEditor/src/HTTPServices.as
===================================================================
diff -u
--- lams_flash/src/central/flex/VideoRecorderFCKEditor/src/HTTPServices.as	(revision 0)
+++ lams_flash/src/central/flex/VideoRecorderFCKEditor/src/HTTPServices.as	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
@@ -0,0 +1,100 @@
+// creates an httpservice and saves a video recording
+import mx.rpc.events.FaultEvent;
+import mx.rpc.events.ResultEvent;
+import mx.rpc.http.HTTPService;
+
+private function saveRecordingToServer(title:String, description:String, filename:String, toolContentId:int):void{
+	var videoRecorderActions:HTTPService  = new HTTPService();
+	videoRecorderActions.url = toolServletUrl;
+	videoRecorderActions.method = "POST";
+	videoRecorderActions.resultFormat = "e4x";
+	videoRecorderActions.request.method = "saveRecording";	
+	videoRecorderActions.request.title = title;
+	videoRecorderActions.request.description = description;
+	videoRecorderActions.request.filename = filename;
+	videoRecorderActions.request.toolContentId = toolContentId;
+	
+	videoRecorderActions.request.saveToLams = false;
+	videoRecorderActions.request.isJustSound = false;
+	videoRecorderActions.request.userId = -1;
+	videoRecorderActions.request.toolSessionId = -1;
+	videoRecorderActions.request.recordingId = -1;
+	videoRecorderActions.request.rating = 0;
+
+	videoRecorderActions.addEventListener(ResultEvent.RESULT, saveRecordingSuccessHandler);
+	videoRecorderActions.addEventListener(FaultEvent.FAULT, saveRecordingFaultHandler);
+	
+	videoRecorderActions.send();
+}
+
+// success handler for successful save recording
+private function saveRecordingSuccessHandler(e:ResultEvent):void {	        	
+	// alert complete
+	Alert.show(dictionary.getLabel("videorecorder.recording.complete.authoring"));
+	
+	// change the start recording button's label
+	videoDisplay.makeReadyVideo(filename);
+	
+	// update tooltip
+	videoControlBar.recordButton.toolTip = dictionary.getLabel("videorecorder.tooltip.start.recording.again");
+					
+	// change the panel status
+	videoDisplayPanel.status = dictionary.getLabel("videorecorder.ready");	
+}
+
+// fault handler for save recording
+private function saveRecordingFaultHandler(e:FaultEvent):void {
+  	Alert.show(e.toString());
+}
+
+// export recording to lams server
+private function copyRecordingToLamsServer(src:String, dir:String, filename:String):void{
+	var videoRecorderActions:HTTPService  = new HTTPService();
+	videoRecorderActions.url = saveToLamsServletUrl;
+	videoRecorderActions.method = "POST";
+	videoRecorderActions.resultFormat = "e4x";
+	
+	videoRecorderActions.request.urlStr = src;
+	videoRecorderActions.request.dir = dir;
+	videoRecorderActions.request.filename = filename;
+
+	videoRecorderActions.addEventListener(ResultEvent.RESULT, copyRecordingToLamsServerSuccessHandler);
+	videoRecorderActions.addEventListener(FaultEvent.FAULT, copyRecordingToLamsServerFaultHandler);
+	
+	videoRecorderActions.send();
+}
+
+// success handler for copy recording
+private function copyRecordingToLamsServerSuccessHandler(e:ResultEvent):void {
+	// rock on
+}
+// fault handler for copy recording
+private function copyRecordingToLamsServerFaultHandler(e:FaultEvent):void {
+	Alert.show(e.toString());
+}
+
+// attempts to get lanugage XML
+private function getLanguageXMLFromServer():void{
+	var videoRecorderActions:HTTPService  = new HTTPService();
+	videoRecorderActions.url = saveToLamsServletUrl;
+	videoRecorderActions.method = "POST";
+	videoRecorderActions.resultFormat = "e4x";
+	
+	videoRecorderActions.request.method = "getLanguageXMLForFCK";
+
+	videoRecorderActions.addEventListener(ResultEvent.RESULT, getLanguageXMLSuccessHandler);
+	videoRecorderActions.addEventListener(FaultEvent.FAULT, getLanguageXMLFaultHandler);
+	
+	videoRecorderActions.send();
+}
+
+// success handler for get lanugage XML
+private function getLanguageXMLSuccessHandler(e:ResultEvent):void {
+	setLanguageXML(String(e.result));
+}
+
+// fault handler for get lanugage XML
+private function getLanguageXMLFaultHandler(e:FaultEvent):void {
+	Alert.show(e.toString());
+}
+
Index: lams_flash/src/central/flex/VideoRecorderFCKEditor/src/VideoControlBar.mxml
===================================================================
diff -u -r251a00158d63f52d7482fa4aa2decb78d6322a8c -r42aa5319fbd33938828764c43dd0ab1ca80e2416
--- lams_flash/src/central/flex/VideoRecorderFCKEditor/src/VideoControlBar.mxml	(.../VideoControlBar.mxml)	(revision 251a00158d63f52d7482fa4aa2decb78d6322a8c)
+++ lams_flash/src/central/flex/VideoRecorderFCKEditor/src/VideoControlBar.mxml	(.../VideoControlBar.mxml)	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
@@ -6,10 +6,12 @@
 			private var _mode:String;
 			
 			private function onCreationComplete(event:Event):void{
-				if(_mode == "playerModeOffline" || _mode == "playerModeOffline"){
+				if(_mode == "playerModeOffline" || _mode == "playerModeOnline"){
 					removeChild(getChildByName("recordButton"));
 					removeChild(getChildByName("saveAndCloseButton"));
 				}
+				else if(_mode == "recorderModeAuthor")
+					removeChild(getChildByName("saveAndCloseButton"));
 			}
 			
 			public function set mode(mode:String):void{
@@ -18,9 +20,9 @@
 		]]>
 	</mx:Script>
 	
-	<mx:Button label="&gt;" width="20" paddingLeft="0" paddingRight="0" paddingTop="0" paddingBottom="0" fontWeight="bold" id="playButton"/>
-	<mx:Button label="O" width="20" paddingLeft="0" paddingRight="0" paddingTop="0" paddingBottom="0" fontWeight="normal" id="recordButton"/>
+	<mx:Button width="20" paddingLeft="0" paddingRight="0" paddingTop="0" paddingBottom="0" id="playButton"/>
+	<mx:Button width="20" paddingLeft="0" paddingRight="0" paddingTop="0" paddingBottom="0" id="recordButton"/>
 	<mx:HSlider width="100%" id="seekSlider"/>
 	<mx:Label text="0:00 / 0:00" width="70" textAlign="center" id="timerLabel"/>
-	<mx:Button label="x" width="20" paddingLeft="0" paddingRight="0" paddingTop="0" paddingBottom="0" fontWeight="normal" id="saveAndCloseButton"/>
+	<mx:Button width="20" paddingLeft="0" paddingRight="0" paddingTop="0" paddingBottom="0" id="saveAndCloseButton"/>
 </mx:ControlBar>
\ No newline at end of file
Index: lams_flash/src/central/flex/VideoRecorderFCKEditor/src/VideoRecorderFCKEditor.mxml
===================================================================
diff -u -r251a00158d63f52d7482fa4aa2decb78d6322a8c -r42aa5319fbd33938828764c43dd0ab1ca80e2416
--- lams_flash/src/central/flex/VideoRecorderFCKEditor/src/VideoRecorderFCKEditor.mxml	(.../VideoRecorderFCKEditor.mxml)	(revision 251a00158d63f52d7482fa4aa2decb78d6322a8c)
+++ lams_flash/src/central/flex/VideoRecorderFCKEditor/src/VideoRecorderFCKEditor.mxml	(.../VideoRecorderFCKEditor.mxml)	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
@@ -3,6 +3,12 @@
 
 	<mx:Script>
 		<![CDATA[
+			
+			//includes
+			include "HTTPServices.as"
+			
+			// imports
+			import mx.managers.PopUpManager;
 			import org.lamsfoundation.lams.common.util.VideoDisplayUtil;
 			import mx.containers.ControlBar;
 			import mx.effects.easing.Elastic;
@@ -14,24 +20,45 @@
 			import mx.controls.Button;
 			import mx.controls.Alert;
 			import org.lamsfoundation.lams.common.dictionary.XMLDictionary;
-		
+			import flash.external.*;
+			import org.lamsfoundation.lams.common.util.LAMSStringUtil;
+			import mx.containers.TitleWindow;
+			
+			// flashvars
+			[Bindable] private var mode:String;
 			private var red5ServerUrl:String;
+			private var red5RecordingsUrl:String;
+			private var saveToLamsDestUrl:String;
+			private var contentFolderUrl:String;
+			private var lamsEarDir:String;
 			private var serverUrl:String;
 			private var filename:String;
+			private var toolContentId:int;
 			private var userId:int;
 			private var languageXML:XML;
-			[Bindable] private var mode:String;
+			private var toolServletUrl:String;
+			private var saveToLamsServletUrl:String;
+			
+			// needed stuff
 			private var dictionary:XMLDictionary;
 			private var nc:NetConnection;
-			private var timer:Timer;
+			private var playTimer:Timer;
+			private var recTimer:Timer;
 			private var cam:Camera;
 			private var mic:Microphone;
+			private var languageTimer:Timer;
+			private var getDetailsPopUp:GetRecordingDetailsPopUp;
 			
+			// static strings
 			private static var red5App:String = "oflaDemo";
+			private static var toolServletLocation:String = "tool/lavidr10/videoRecorderActions.do";
+			private static var saveToLamsServletLocation:String = "GetRecording";
 			
+			// embeds
 			[Embed(source="./assets/images/playIcon.swf")] [Bindable] private var playIcon:Class;
 			[Embed(source="./assets/images/pauseIcon.swf")] [Bindable] private var pauseIcon:Class;
 			[Embed(source="./assets/images/recordIcon.swf")] [Bindable] private var recordIcon:Class;
+			[Embed(source="./assets/images/okIcon.swf")] [Bindable] private var saveIcon:Class;
 			
 			// called first of all, before any components are initialized
 			private function onPreinitialize(event:Event):void{
@@ -42,27 +69,9 @@
 				if(mode == null){
 					red5ServerUrl = new String("rtmp://172.20.100.22/");
 					serverUrl = new String("http://172.20.100.220:8080/lams/");
-					filename = new String("files/lamsRecording_session1_user1_593243931.flv");
-					userId = 1;
-					mode = new String("recorderMode");
+					mode = new String("recorderModeAuthor");
+					toolContentId = 24;
 				}
-				
-				// if no red5 server is specified, take for granted that mode is 
-				if(!red5ServerUrl){
-					mode = "playerModeOffline";
-				}
-				
-				// add the app name to the red5 url to complete the url
-				red5ServerUrl += red5App;
-				
-				/*
-				Alert.show(
-					"filename: " + filename +
-					"\nuserId: " + userId +
-					"\nred5ServerUrl: " + red5ServerUrl +
-					"\nserverUrl: " + serverUrl +
-					"\nmode: " + mode);
-				*/
 			}
 			
 			// add the appropriate controlbar, called after the videoDisplay component is added to the panel container
@@ -78,41 +87,124 @@
 			}
 			
 			// called after everything is created and ready to go
-			private function onApplicationComplete(event:Event):void {		
+			private function onApplicationComplete(event:Event):void {
+				// add an external interface callback to all setLanguageXML to be called from js
+				ExternalInterface.addCallback("setLanguageXML", setLanguageXML);					
+				
 				// init labels if languageXML is not empty
 				if(languageXML.toString() != ""){
-					dictionary = new XMLDictionary(languageXML);
-					setLabels();
+					setLanguageXML(languageXML);
 				}
 				else{
+					// create a placeholder dictionary
 					dictionary = new XMLDictionary(new XML(""));
+					
+					// attempt to get the dictionary via servlet
+					getLanguageXMLFromServer();
 				}
 				
-				videoControlBar.playButton.setStyle("icon", playIcon);
+				// set button icons
+				setIcons();
+				
+				// init buttons states
 				videoControlBar.playButton.enabled = false;
 				videoControlBar.seekSlider.enabled = false;
+				videoControlBar.saveAndCloseButton.enabled = false;
 				
 				// add listeners
 				addListeners();
 				
-				if(mode == "playerModeOnline"){
-					createConnection();
+				// add the app name to the red5 url to complete the url
+				red5ServerUrl += red5App;
+				
+				// add the tool servlet location
+				toolServletUrl = serverUrl + toolServletLocation;
+				
+				// add the save to lams servlet location
+				saveToLamsServletUrl = serverUrl + saveToLamsServletLocation;
+				
+				/*
+				Alert.show(
+					"filename: " + filename +
+					"\nred5ServerUrl: " + red5ServerUrl +
+					"\nserverUrl: " + serverUrl +
+					"\nlanguageXML: " + languageXML +
+					"\ntoolContentId: " + toolContentId +
+					"\ntoolServletUrl: " + toolServletUrl +
+					"\nsaveToLamsServletUrl: " + saveToLamsServletUrl +
+					"\nred5RecordingsUrl: " + red5RecordingsUrl +
+					"\nsaveToLamsDestUrl: " + saveToLamsDestUrl +
+					"\nlamsEarDir: " + lamsEarDir +
+					"\nmode: " + mode);
+				*/
+				
+				// swtich on mode
+				switch(mode){
+					case "playerModeOnline":{
+						createConnection();
+						break;
+					}
+
+					case "playerModeOffline":{
+						var nc:NetConnection = new NetConnection();
+						nc.connect(null);
+						videoDisplay.bufferTime = 0;
+						videoDisplay.setNetConnection(nc);
+						videoDisplay.makeReadyVideo(filename);
+						break;
+					}
+					case "recorderModeFCK":{
+						toolContentId = -1;
+						
+						if(!isWebcamInfoSet())
+						{
+							Security.showSettings();
+							setWebcamInfo(true);
+						}
+						
+						cam = VideoDisplayUtil.setupCamera();
+						mic = VideoDisplayUtil.setupMic();
+						videoDisplay.attachCamera(cam);
+						videoDisplay.attachMic(mic);
+						videoDisplay.bufferTime = 2;
+						createConnection();
+						break;
+					}
+					case "recorderModeAuthor":{
+						userId = -1;
+						
+						if(!isWebcamInfoSet())
+						{
+							Security.showSettings();
+							setWebcamInfo(true);
+						}
+						
+						cam = VideoDisplayUtil.setupCamera();
+						mic = VideoDisplayUtil.setupMic();
+						videoDisplay.attachCamera(cam);
+						videoDisplay.attachMic(mic);
+						videoDisplay.bufferTime = 2;
+						createConnection();
+
+						break;
+					}
 				}
-				else if(mode == "playerModeOffline"){
-					var nc:NetConnection = new NetConnection();
-					nc.connect(null);
-					videoDisplay.bufferTime = 0;
-					videoDisplay.setNetConnection(nc);
-					videoDisplay.makeReadyVideo(filename);
+			}
+						
+			// sets language xml, usually called at a later time through javascript
+			public function setLanguageXML(languageXMLString:String):void{
+				if(languageXMLString != "" || languageXMLString != null){
+					try{
+						languageXML = XML(languageXMLString);
+					}
+					catch(e:Error){
+						languageXML = XML(unescape(languageXMLString));
+					}
+					
+					dictionary = new XMLDictionary(languageXML);
+					setLabels();
+					setTooltips();
 				}
-				else if(mode == "recorderMode"){
-					cam = VideoDisplayUtil.setupCamera();
-					mic = VideoDisplayUtil.setupMic();
-					videoDisplay.attachCamera(cam);
-					videoDisplay.attachMic(mic);
-					videoDisplay.bufferTime = 2;
-					createConnection();
-				}
 			}
 			
 			// adds some listeners
@@ -129,38 +221,99 @@
 				videoControlBar.seekSlider.addEventListener(SliderEvent.CHANGE, seekSliderChange);
 				videoControlBar.seekSlider.addEventListener(SliderEvent.THUMB_PRESS, seekSliderClick);
 				videoControlBar.seekSlider.addEventListener(SliderEvent.THUMB_RELEASE, seekSliderClick);
+				videoControlBar.seekSlider.dataTipFormatFunction = VideoDisplayUtil.secondsToString;
 				
-				if(mode == "recorderMode"){
-					videoControlBar.recordButton.addEventListener(MouseEvent.CLICK, recordClick);
-					videoControlBar.saveAndCloseButton.addEventListener(MouseEvent.CLICK, saveAndCloseClick);
+				switch(mode){
+					case "recorderModeFCK":{
+						videoControlBar.recordButton.addEventListener(MouseEvent.CLICK, recordClick);
+						videoControlBar.saveAndCloseButton.addEventListener(MouseEvent.CLICK, saveAndCloseClick);
+						break;
+					}
+					case "recorderModeAuthor":{
+						videoControlBar.recordButton.addEventListener(MouseEvent.CLICK, recordClick);
+						break;
+					}
 				}
-				
-				videoControlBar.seekSlider.dataTipFormatFunction = VideoDisplayUtil.secondsToString;
 			}
 			
-			// sets labels
+			// sets initial labels
 			private function setLabels():void{
-				if(mode == "playerModeOffline" || mode == "playerModeOffline"){
+				if(mode == "playerModeOnline" || mode == "playerModeOffline"){
 					videoDisplayPanel.title = dictionary.getLabel("videorecorder.video.player");
 				}
-				else if(mode == "recorderMode"){
+				else if(mode == "recorderModeFCK"){
 					videoDisplayPanel.title = dictionary.getLabel("videorecorder.video.recorder");
 				}
 				
 				videoDisplayPanel.status = dictionary.getLabel("videorecorder.waiting");
 			}
 			
+			// sets initial tooltips
+			private function setTooltips():void{
+				switch(mode){
+					case "playerModeOnline":{
+						videoControlBar.playButton.toolTip = dictionary.getLabel("videorecorder.tooltip.play");
+						break;
+					}
+					case "playerModeOffline":{
+						videoControlBar.playButton.toolTip = dictionary.getLabel("videorecorder.tooltip.play");
+						break;
+					}
+					case "recorderModeFCK":{
+						videoControlBar.playButton.toolTip = dictionary.getLabelAndConcatenate("videorecorder.tooltip.play", [" (", dictionary.getLabel("videorecorder.disabled"), ")"]);
+						videoControlBar.recordButton.toolTip = dictionary.getLabel("videorecorder.tooltip.start.recording");
+						videoControlBar.saveAndCloseButton.toolTip = dictionary.getLabelAndConcatenate("videorecorder.tooltip.save.recording", [" (", dictionary.getLabel("videorecorder.disabled"), ")"]);
+						break;
+					}
+					case "recorderModeAuthor":{
+						videoControlBar.playButton.toolTip = dictionary.getLabelAndConcatenate("videorecorder.tooltip.play", [" (", dictionary.getLabel("videorecorder.disabled"), ")"]);
+						videoControlBar.recordButton.toolTip = dictionary.getLabel("videorecorder.tooltip.start.recording");
+						break;
+					}
+				}
+			}
+			
+			// sets initial icons
+			private function setIcons():void{
+				videoControlBar.playButton.setStyle("icon", playIcon);
+				videoControlBar.recordButton.setStyle("icon", recordIcon);
+				videoControlBar.saveAndCloseButton.setStyle("icon", saveIcon);
+			}
+			
 			// gets flashvars
 			private function getFlashVars():void{
 				red5ServerUrl = Application.application.parameters.red5ServerUrl;
 				serverUrl = Application.application.parameters.serverUrl;
 				filename = Application.application.parameters.filename;
-				userId = Application.application.parameters.userId;
 				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;
+				saveToLamsDestUrl = Application.application.parameters.saveToLamsDestUrl;
+				lamsEarDir = Application.application.parameters.lamsEarDir;
+				contentFolderUrl = Application.application.parameters.contentFolderUrl;
 			}
 			
-			// creates a netconnection is its needed
+			// checks for previous webcam info
+			private function isWebcamInfoSet():Boolean{
+				var lamsVideoRecorderInfo:Object = SharedObject.getLocal("lamsWebcamInfo");
+				
+				if(lamsVideoRecorderInfo.data.webcamSet){
+					return lamsVideoRecorderInfo.data.webcamSet;
+				}else{
+					return false;
+				}
+					
+			}
+			
+			// sets webcam info
+			private function setWebcamInfo(checked:Boolean):void{
+				var lamsVideoRecorderInfo:Object = SharedObject.getLocal("lamsWebcamInfo");
+				lamsVideoRecorderInfo.data.webcamSet = checked;
+			}
+			
+			// creates a netconnection if it is needed
 			private function createConnection():void{
 				// create basic netConnection object
 				nc = new NetConnection();
@@ -190,12 +343,24 @@
 					Application.application.enabled = true;
 					
 					// if we are in a player instance
-					if(mode == "playerModeOffline" || mode == "playerModeOffline"){
+					if(mode == "playerModeOffline" || mode == "playerModeOnline"){
 						videoDisplay.makeReadyVideo(filename);
 					}
-					else if(mode == "recorderMode"){
+					// 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 == "")){
 						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 != ""){					
+						// change the start recording button's label
+						videoDisplay.makeReadyVideo(filename);
+						
+						// update tooltip
+						videoControlBar.recordButton.toolTip = dictionary.getLabel("videorecorder.tooltip.start.recording.next");
+										
+						// change the panel status
+						videoDisplayPanel.status = dictionary.getLabel("videorecorder.ready");	
+					}
 
 				}
 				// if connection unsuccessful
@@ -216,10 +381,12 @@
 				}
 			}
 			
+			// netconnection security error handler
 			private function securityErrorHandler(event:SecurityErrorEvent):void {
 				trace("securityErrorHandler: " + event);
 			}
-	
+			
+			// netconnection async error handler
 			private  function asyncErrorHandler(event:AsyncErrorEvent):void {
 				trace("securityErrorHandler: " + event);
 			} 
@@ -235,10 +402,31 @@
 				videoDisplay.play();
 			}
 
+        	// handler called when the confirm action ("ok", "cancel", "save") on a popup is hit
+        	private function popUpRemovedHandler(event:Event):void{
+        		// if the given popup is of type getDetailsPopUp
+        		if(event.target == getDetailsPopUp){
+        			// get the details
+        			var title:String = getDetailsPopUp.titleInput.text;
+        			var description:String = getDetailsPopUp.descriptionInput.text;
+        			
+        			// call the http service to save a recording
+        			saveRecordingToServer(title, description, filename + ".flv", toolContentId);
+        		}
+        		
+        		if(event.target is TitleWindow){
+        			PopUpManager.removePopUp(TitleWindow(event.target));
+        		}
+        	}
+        	
 			// record button click handler
 			private function recordClick(event:MouseEvent):void{
 				if(!videoDisplay.isPublishing){
-					filename = VideoDisplayUtil.createFilenameForFCK(userId);
+					if(mode == "recorderModeFCK")
+						filename = VideoDisplayUtil.createFilenameForFCK(userId);
+					else if(mode == "recorderModeAuthor")
+						filename = VideoDisplayUtil.createFilenameForAuthor(toolContentId);
+						
 					videoDisplay.startPublish(filename);
 				}
 				else if(videoDisplay.isPublishing)
@@ -247,7 +435,13 @@
 			
 			// save and close button click handler
 			private function saveAndCloseClick(event:MouseEvent):void{
+				var eventObj:Object = new Object();
+			 	eventObj.filename = contentFolderUrl + filename + ".flv";
+				eventObj.red5ServerUrl = red5ServerUrl;
+				eventObj.mode = "playerModeOffline";
+				eventObj.languageXML = languageXML.toXMLString();
 
+				ExternalInterface.call("saveToFCKEditor", eventObj); 
 			}
 			
 			// onMetaData callback, called from videoDisplay
@@ -256,55 +450,95 @@
 				videoControlBar.seekSlider.minimum = 0;
 				videoControlBar.seekSlider.maximum = event.metadata.duration;
 				
-				timer = new Timer(10);
-				timer.addEventListener(TimerEvent.TIMER, updateSeekSlider);
-				timer.start();
+				playTimer = new Timer(10);
+				playTimer.addEventListener(TimerEvent.TIMER, updateSeekSlider);
+				playTimer.start();
 			}
 			
 			// onReady callback, called from videoDisplay
 			private function onReady(event:VideoDisplayEvent):void{
 				videoControlBar.playButton.enabled = true;
 				videoControlBar.seekSlider.enabled = true;
 				videoControlBar.playButton.setStyle("icon", playIcon);
+				videoControlBar.playButton.toolTip = dictionary.getLabel("videorecorder.tooltip.play");
 				videoDisplayPanel.status = dictionary.getLabel("videorecorder.ready");
 			}
 			
 			// onUnpause callback, called from videoDisplay
 			private function onUnpause(event:VideoDisplayEvent):void{
 				videoControlBar.playButton.setStyle("icon", pauseIcon);
+				videoControlBar.playButton.toolTip = dictionary.getLabel("videorecorder.tooltip.pause");
 				videoDisplayPanel.status = dictionary.getLabel("videorecorder.playing");
 			}
 			
 			// onPause callback, called from videoDisplay
 			private function onPause(event:VideoDisplayEvent):void{
 				videoControlBar.playButton.setStyle("icon", playIcon);
+				videoControlBar.playButton.toolTip = dictionary.getLabel("videorecorder.tooltip.resume");
 				videoDisplayPanel.status = dictionary.getLabel("videorecorder.paused");
 			}
 			
 			// onComplete callback, called from videoDisplay
 			private function onComplete(event:VideoDisplayEvent):void{
 				videoControlBar.playButton.setStyle("icon", playIcon);
+				videoControlBar.playButton.toolTip = dictionary.getLabel("videorecorder.tooltip.play");
 				videoDisplayPanel.status = dictionary.getLabel("videorecorder.ready");
 			}
 			
+			// onStartPublish callback, called from videoDisplay
 			private function onStartPublish(event:VideoDisplayEvent):void{
 				// stop the timer if it is created
-				if(timer)
-					timer.stop();
+				if(playTimer)
+					playTimer.stop();
 					
 				videoControlBar.playButton.enabled = false;
+				videoControlBar.playButton.toolTip = dictionary.getLabelAndConcatenate("videorecorder.tooltip.play", [" (", dictionary.getLabel("videorecorder.disabled"), ")"]);
+				
 				videoControlBar.seekSlider.enabled = false;
-				videoControlBar.timerLabel.text = "00:00";
+				videoControlBar.seekSlider.minimum = 0;
+				videoControlBar.seekSlider.maximum = 0;
+				videoControlBar.seekSlider.value = videoControlBar.seekSlider.minimum;
+				
+				videoControlBar.recordButton.toolTip = dictionary.getLabel("videorecorder.tooltip.stop.recording");
+				
 				videoDisplayPanel.status = dictionary.getLabel("videorecorder.recording");
+				
+				recTimer = new Timer(250);
+				recTimer.addEventListener(TimerEvent.TIMER, updateTimerLabelForRecording);
+				recTimer.start();
 			}
 			
+			// onStopPublish callback, called from videoDisplay
 			private function onStopPublish(event:VideoDisplayEvent):void{
-				// alert complete
-				Alert.show("Recording complete. Click play to review, record to record again or close to post the current recording.");
+				if(mode == "recorderModeFCK"){
+					// alert complete
+					Alert.show(dictionary.getLabel("videorecorder.recording.complete.fck"));
+					
+					// change the start recording button's label
+					videoDisplay.makeReadyVideo(filename);
+					
+					// change the panel status
+					videoDisplayPanel.status = dictionary.getLabel("videorecorder.ready");
+					
+					// update tooltip
+					videoControlBar.recordButton.toolTip = dictionary.getLabel("videorecorder.tooltip.start.recording.again");
+					
+					// 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"){
+					// get the details needed
+					getDetailsPopUp = GetRecordingDetailsPopUp(PopUpManager.createPopUp(this, GetRecordingDetailsPopUp, true));
+					PopUpManager.centerPopUp(getDetailsPopUp);
+					getDetailsPopUp.init(dictionary);
+					getDetailsPopUp.addEventListener("popUpClose", popUpRemovedHandler);
+				}
 				
-				// change the start recording button's label
-				videoDisplay.makeReadyVideo(filename);
-				videoDisplayPanel.status = dictionary.getLabel("videorecorder.ready");
+				recTimer.stop();
 			}
 						
 			// update method called from a timer (launched when metadata is received)
@@ -321,6 +555,12 @@
 				}
 			}
 			
+			// updates timerLabel when recording
+			private function updateTimerLabelForRecording(event:TimerEvent):void{
+				var timer:Timer = Timer(event.currentTarget);
+				videoControlBar.timerLabel.text = VideoDisplayUtil.secondsToString(String(timer.currentCount * timer.delay / 1000));
+			}
+			
 			// seek slider click handler
 			private function seekSliderClick(event:SliderEvent):void {
 				// if seekslider is enabled
@@ -329,23 +569,24 @@
 					// if the mouse is pressed
 					if(event.type == SliderEvent.THUMB_PRESS){
 						// stop the timer so that the bar seekSlider can manually be controlled
-						timer.stop();
+						playTimer.stop();
 					}
 					// if the mouse is released
 					else if(event.type == SliderEvent.THUMB_RELEASE){
 						// start the timer again and allow it to regain control of the seekSlider
-						timer.start();
+						playTimer.start();
 					}
 				}
 			}
 			
+			// seeks to the given place in the movie
 			private function seekSliderChange(event:SliderEvent):void {
 				videoDisplay.seek(event.value);
 			}
 			
 		]]>
 	</mx:Script>
-	<mx:Panel x="10" y="10" width="340" height="310" layout="absolute" title="Video Recorder" id="videoDisplayPanel">
+	<mx:Panel x="10" y="10" width="340" height="310" layout="absolute" id="videoDisplayPanel">
 		<ns1:VideoDisplay x="0" y="0" id="videoDisplay" />
 		<ns2:VideoControlBar x="127" y="216" id="videoControlBar" mode="{mode}">
 		</ns2:VideoControlBar>
Index: lams_flash/src/central/flex/VideoRecorderFCKEditor/src/assets/images/okIcon.swf
===================================================================
diff -u
Binary files differ
Index: lams_flash/src/common/flex/org/lamsfoundation/lams/common/ui/components/VideoDisplay.mxml
===================================================================
diff -u -r251a00158d63f52d7482fa4aa2decb78d6322a8c -r42aa5319fbd33938828764c43dd0ab1ca80e2416
--- lams_flash/src/common/flex/org/lamsfoundation/lams/common/ui/components/VideoDisplay.mxml	(.../VideoDisplay.mxml)	(revision 251a00158d63f52d7482fa4aa2decb78d6322a8c)
+++ lams_flash/src/common/flex/org/lamsfoundation/lams/common/ui/components/VideoDisplay.mxml	(.../VideoDisplay.mxml)	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
@@ -298,45 +298,42 @@
 			
 			// view camera helper method to start and stop actual viewing
 			public function viewCameraHelper():void {
-				// if camera is set
-				if(_cam){
-					// if camera is not being used
-					if(!isCameraViewed){
-						// reset video
-						reset();
+				// if camera is not being used
+				if(!isCameraViewed){
+					// reset video
+					reset();
+					
+					// if the item clicked is full video OR if showing a camera
+					if(_cam){
+						// attach the cam to the videoDisplay
+						video.attachCamera(_cam);
 						
-						// if the item clicked is full video OR if showing a camera
-						if(_cam && _mic){
-							// attach the cam to the videoDisplay
-							video.attachCamera(_cam);
-							
-							//change the view stack
-							selectedChild = recorderView;
-						}
-						// else if the item played is sound OR if we can only start sound
-						else if(_mic && !_cam){
-							//change the view stack
-							selectedChild = audioView;
-						}
-	
-						_isCameraViewed = true;
-						
-						// dispatch event
-						dispatchEvent(new VideoDisplayEvent(VideoDisplayEvent.STARTCAM));
+						//change the view stack
+						selectedChild = recorderView;
 					}
-					// if camera is being used
-					else {
-						// clear the videoDisplay
-						video.attachCamera(null);
-						_isCameraViewed = false;
-						
-						// change view
-						selectedChild = blackView;
-						
-						// dispatch event
-						dispatchEvent(new VideoDisplayEvent(VideoDisplayEvent.STOPCAM));
+					// else if the item played is sound OR if we can only start sound
+					else if(_mic && !_cam){
+						//change the view stack
+						selectedChild = audioView;
 					}
+
+					_isCameraViewed = true;
+					
+					// dispatch event
+					dispatchEvent(new VideoDisplayEvent(VideoDisplayEvent.STARTCAM));
 				}
+				// if camera is being used
+				else {
+					// clear the videoDisplay
+					video.attachCamera(null);
+					_isCameraViewed = false;
+					
+					// change view
+					selectedChild = blackView;
+					
+					// dispatch event
+					dispatchEvent(new VideoDisplayEvent(VideoDisplayEvent.STOPCAM));
+				}
 			}
 			
 			// publish method
Index: lams_flash/src/common/flex/org/lamsfoundation/lams/common/util/ArgumentsToRendererFactory.as
===================================================================
diff -u
--- lams_flash/src/common/flex/org/lamsfoundation/lams/common/util/ArgumentsToRendererFactory.as	(revision 0)
+++ lams_flash/src/common/flex/org/lamsfoundation/lams/common/util/ArgumentsToRendererFactory.as	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
@@ -0,0 +1,31 @@
+package org.lamsfoundation.lams.common.util
+{
+   import flash.utils.Dictionary;
+   
+   import mx.core.IFactory;
+
+   public class ArgumentsToRendererFactory implements IFactory
+   {
+      private var klass:Class;
+      private var args:*;
+      
+      public function ArgumentsToRendererFactory(args:*,klass:Class) {
+         this.args=args;
+         this.klass=klass;
+      }
+      
+      public function newInstance():*
+      {
+         var instance:Object = new klass;
+         
+
+         for (var key:String in args) {
+            if (instance.hasOwnProperty(key)) {
+               instance[key] = args[key];
+            }
+         }
+         
+         return instance;   
+      }
+   }
+}
\ No newline at end of file
Index: lams_flash/src/common/flex/org/lamsfoundation/lams/common/util/VideoDisplayUtil.as
===================================================================
diff -u -r251a00158d63f52d7482fa4aa2decb78d6322a8c -r42aa5319fbd33938828764c43dd0ab1ca80e2416
--- lams_flash/src/common/flex/org/lamsfoundation/lams/common/util/VideoDisplayUtil.as	(.../VideoDisplayUtil.as)	(revision 251a00158d63f52d7482fa4aa2decb78d6322a8c)
+++ lams_flash/src/common/flex/org/lamsfoundation/lams/common/util/VideoDisplayUtil.as	(.../VideoDisplayUtil.as)	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
@@ -26,6 +26,11 @@
        		
 			return "lamsRecording_forFCK" + "_user" + userId + "_" + randomNumber(1, 1000000000);
        	}
+       	
+       	public static function createFilenameForAuthor(toolContentId:int):String{
+       		
+       		return "lamsRecording_tool" + toolContentId + "_" + randomNumber(1, 1000000000);
+       	}
 	       
 	   	// creates a random number between bounds
        	private static function randomNumber(low:Number=NaN, high:Number=NaN):Number {
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/MultipleDirFileBundler.java
===================================================================
diff -u
--- lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/MultipleDirFileBundler.java	(revision 0)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/MultipleDirFileBundler.java	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
@@ -0,0 +1,70 @@
+package org.lamsfoundation.lams.learning.export.web.action;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.util.ArrayList;
+
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+
+import org.lamsfoundation.lams.util.HttpUrlConnectionUtil;
+import org.lamsfoundation.lams.learning.export.web.action.Bundler;
+
+/**
+ * Added this bundler when files need to be accessed from different directories
+ * 
+ * @author pgeorges
+ *
+ */
+
+public class MultipleDirFileBundler extends Bundler {
+	
+	public MultipleDirFileBundler() {}
+	
+	/**
+	 * This method bundles the files to the given output dir
+	 * 
+	 * @param request the request for the export
+	 * @param cookies cookies for the request
+	 * @param outputDirectory the location where the files should be written
+	 * @param toolImageUrlDir the url location of the images directory
+	 * @param fileNames an array of file-names (not paths) you wish to include in the bundle
+	 * @throws Exception
+	 */
+	public void bundle(HttpServletRequest request, Cookie[] cookies, String outputDirectory, String[] fileUrlDir, ArrayList<String>[] filenames) throws Exception
+	{
+		bundleViaHTTP(request, cookies, outputDirectory, fileUrlDir, filenames);
+	}
+	
+	/**
+	 * See bundle
+	 * 
+	 * @param request
+	 * @param cookies
+	 * @param outputDirectory
+	 * @param toolImageUrlDir
+	 * @param fileNames
+	 * @throws MalformedURLException
+	 * @throws FileNotFoundException
+	 * @throws IOException
+	 */
+	private void bundleViaHTTP(HttpServletRequest request, Cookie[] cookies, String outputDirectory, String[] fileUrlDir, ArrayList<String>[] filenames) 
+	throws MalformedURLException, FileNotFoundException, IOException 
+	{
+		
+		String fileDirStr = outputDirectory+File.separator+"files";
+		File fileDir = new File(fileDirStr);
+		fileDir.mkdirs();
+				
+		for(int i = 0; i < filenames.length; i++){
+			ArrayList<String> filenameArray = filenames[i];
+			
+			for(int j = 0; j < filenameArray.size(); j++){
+				String url = fileUrlDir[i] + filenameArray.get(j);
+				HttpUrlConnectionUtil.writeResponseToFile(url, fileDirStr, filenameArray.get(j), cookies);
+			}
+		}
+	}
+}
Index: lams_tool_videorecorder/db/sql/create_lams_tool_videoRecorder.sql
===================================================================
diff -u -r049932651d9d1c08ed1681df0a044d7f519a4215 -r42aa5319fbd33938828764c43dd0ab1ca80e2416
--- lams_tool_videorecorder/db/sql/create_lams_tool_videoRecorder.sql	(.../create_lams_tool_videoRecorder.sql)	(revision 049932651d9d1c08ed1681df0a044d7f519a4215)
+++ lams_tool_videorecorder/db/sql/create_lams_tool_videoRecorder.sql	(.../create_lams_tool_videoRecorder.sql)	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
@@ -41,6 +41,8 @@
 	allow_learner_video_export bit,
 	allow_comments bit,
 	allow_ratings bit,
+	export_offline bit,
+	export_all bit,
 	primary key (uid)
 )type=innodb;
 
@@ -56,6 +58,7 @@
 
 create table tl_lavidr10_recording (
 	uid bigint not null auto_increment,
+	tool_content_id bigint,
 	create_date datetime,
 	update_date datetime,
 	create_by bigint,
@@ -118,7 +121,9 @@
 	allow_learner_video_visibility,
 	allow_learner_video_export,
 	allow_comments,
-	allow_ratings) 
+	allow_ratings,
+	export_offline,
+	export_all) 
 VALUES(
 	"VideoRecorder",
 	"Instructions",
@@ -134,6 +139,8 @@
 	1,
 	1,
 	1,
+	1,
+	1,
 	1
 );
 
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/IVideoRecorderRecordingDAO.java
===================================================================
diff -u -r3d081de4a45da632ee6029251318fac795d41813 -r42aa5319fbd33938828764c43dd0ab1ca80e2416
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/IVideoRecorderRecordingDAO.java	(.../IVideoRecorderRecordingDAO.java)	(revision 3d081de4a45da632ee6029251318fac795d41813)
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/IVideoRecorderRecordingDAO.java	(.../IVideoRecorderRecordingDAO.java)	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
@@ -42,6 +42,8 @@
 
 	List<VideoRecorderRecording> getByToolSessionId(Long toolSessionId);
 	
+	List<VideoRecorderRecording> getByToolContentId(Long toolContentId);
+	
 	List<VideoRecorderRecording> getBySessionAndUserIds(Long toolSessionId, Long userId);
 	
 	void saveOrUpdate(VideoRecorderRecording videoRecorderRecording);
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderRecordingDAO.java
===================================================================
diff -u -r3d081de4a45da632ee6029251318fac795d41813 -r42aa5319fbd33938828764c43dd0ab1ca80e2416
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderRecordingDAO.java	(.../VideoRecorderRecordingDAO.java)	(revision 3d081de4a45da632ee6029251318fac795d41813)
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderRecordingDAO.java	(.../VideoRecorderRecordingDAO.java)	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
@@ -43,6 +43,9 @@
 	private static final String SQL_QUERY_BY_SESSION_ID = "from " + VideoRecorderRecording.class.getName() + " as vrr "
 	+ "where vrr.videoRecorderSession.sessionId=?";
 	
+	private static final String SQL_QUERY_BY_TOOL_CONTENT_ID = "from " + VideoRecorderRecording.class.getName() + " as vrr "
+	+ "where vrr.toolContentId=?";
+	
 	private static final String SQL_QUERY_BY_SESSION_ID_AND_USER_ID = "from " + VideoRecorderRecording.class.getName() + " as vrr "
 	+ "where vrr.videoRecorderSession.sessionId=? and vrr.createBy=?";
 	
@@ -65,6 +68,10 @@
 		return (List<VideoRecorderRecording>)(this.getHibernateTemplate().find(SQL_QUERY_BY_SESSION_ID_AND_USER_ID, new Object[] {toolSessionId, userId}));
 	}
 
+	public List<VideoRecorderRecording> getByToolContentId(Long toolContentId){
+		return (List<VideoRecorderRecording>)(this.getHibernateTemplate().find(SQL_QUERY_BY_TOOL_CONTENT_ID, toolContentId));
+	}
+	
     public void saveOrUpdate(VideoRecorderRecording videoRecorderRecording) {
 		this.getHibernateTemplate().saveOrUpdate(videoRecorderRecording);
 		this.getHibernateTemplate().flush();
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dto/VideoRecorderDTO.java
===================================================================
diff -u -r049932651d9d1c08ed1681df0a044d7f519a4215 -r42aa5319fbd33938828764c43dd0ab1ca80e2416
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dto/VideoRecorderDTO.java	(.../VideoRecorderDTO.java)	(revision 049932651d9d1c08ed1681df0a044d7f519a4215)
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dto/VideoRecorderDTO.java	(.../VideoRecorderDTO.java)	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
@@ -59,13 +59,15 @@
     
     public boolean allowUseCamera;
     
-    public boolean allowLearnerVideoExport;
-    
     public boolean allowLearnerVideoVisibility;
     
     public boolean allowComments;
     
     public boolean allowRatings;
+    
+    public boolean exportOffline;
+    
+    public boolean exportAll;
 	
 	public Set<VideoRecorderAttachmentDTO> onlineInstructionsFiles;
 
@@ -88,10 +90,11 @@
 		lockOnFinish = videoRecorder.isLockOnFinished();
 		allowUseVoice = videoRecorder.isAllowUseVoice();
 		allowUseCamera = videoRecorder.isAllowUseCamera();
-		allowLearnerVideoExport = videoRecorder.isAllowLearnerVideoExport();
 		allowLearnerVideoVisibility = videoRecorder.isAllowLearnerVideoVisibility();
 		allowComments = videoRecorder.isAllowComments();
 		allowRatings = videoRecorder.isAllowRatings();
+		exportAll = videoRecorder.isExportAll();
+		exportOffline = videoRecorder.isExportOffline();
 
 		onlineInstructionsFiles = new TreeSet<VideoRecorderAttachmentDTO>();
 		offlineInstructionsFiles = new TreeSet<VideoRecorderAttachmentDTO>();
@@ -218,15 +221,7 @@
 	public void setLearnerVideoVisibility(boolean allowLearnerVideoVisibility) {
 		this.allowLearnerVideoVisibility = allowLearnerVideoVisibility;
 	}
-	
-	public boolean isAllowLearnerVideoExport() {
-		return allowLearnerVideoExport;
-	}
-
-	public void setAllowLearnerVideoExport(boolean allowLearnerVideoExport) {
-		this.allowLearnerVideoExport = allowLearnerVideoExport;
-	}
-	
+		
 	public boolean isAllowComments() {
 		return allowComments;
 	}
@@ -243,6 +238,22 @@
 		this.allowRatings = allowRatings;
 	}
 	
+	public boolean isExportOffline() {
+		return exportOffline;
+	}
+
+	public void setExportOffline(boolean exportOffline) {
+		this.exportOffline = exportOffline;
+	}
+	
+	public boolean isExportAll() {
+		return exportAll;
+	}
+
+	public void setExportAll(boolean exportAll) {
+		this.exportAll = exportAll;
+	}
+	
 	public boolean isLockOnFinish() {
 		return lockOnFinish;
 	}
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dto/VideoRecorderRecordingDTO.java
===================================================================
diff -u -r049932651d9d1c08ed1681df0a044d7f519a4215 -r42aa5319fbd33938828764c43dd0ab1ca80e2416
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dto/VideoRecorderRecordingDTO.java	(.../VideoRecorderRecordingDTO.java)	(revision 049932651d9d1c08ed1681df0a044d7f519a4215)
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dto/VideoRecorderRecordingDTO.java	(.../VideoRecorderRecordingDTO.java)	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
@@ -47,6 +47,8 @@
 	private static Logger logger = Logger.getLogger(VideoRecorderRecordingDTO.class);
 
 	public Long uid;
+	
+	public Long toolContentId;
 
 	public Date createDate;
 
@@ -75,6 +77,7 @@
 	
 	public VideoRecorderRecordingDTO(VideoRecorderRecording videoRecorderRecording) {
 		this.uid = videoRecorderRecording.getUid();
+		this.toolContentId = videoRecorderRecording.getToolContentId();
 		this.createDate = videoRecorderRecording.getCreateDate();
 		this.updateDate = videoRecorderRecording.getUpdateDate();
 		this.createBy = videoRecorderRecording.getCreateBy();
@@ -112,6 +115,14 @@
 	this.uid = uid;
     }
 
+    public Long getToolContentId() {
+	return toolContentId;
+    }
+
+    public void setToolContentId(Long toolContentId) {
+	this.toolContentId = toolContentId;
+    }    
+   
     public Date getCreateDate() {
 	return createDate;
     }
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorder.java
===================================================================
diff -u -r049932651d9d1c08ed1681df0a044d7f519a4215 -r42aa5319fbd33938828764c43dd0ab1ca80e2416
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorder.java	(.../VideoRecorder.java)	(revision 049932651d9d1c08ed1681df0a044d7f519a4215)
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorder.java	(.../VideoRecorder.java)	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
@@ -71,15 +71,17 @@
     private boolean allowUseVoice;
     
     private boolean allowUseCamera;
-    
-    private boolean allowLearnerVideoExport;
-    
+        
     private boolean allowLearnerVideoVisibility;
     
     private boolean allowComments;
     
     private boolean allowRatings;
     
+    private boolean exportOffline;
+    
+    private boolean exportAll;
+    
     private String onlineInstructions;
 
     private String offlineInstructions;
@@ -110,7 +112,8 @@
 	    boolean runOffline, boolean lockOnFinished, boolean filteringEnabled, String filterKeywords,
 	    String onlineInstructions, String offlineInstructions, boolean contentInUse, boolean defineLater,
 	    boolean allowUseVoice, boolean allowUseCamera, boolean allowLearnerVideoExport, boolean allowLearnerVideoVisibility,
-	    Long toolContentId, Set videoRecorderAttachments, Set videoRecorderSessions) {
+	    Long toolContentId, Set videoRecorderAttachments, Set videoRecorderSessions, boolean exportAll,
+	    boolean exportOffline) {
 	this.createDate = createDate;
 	this.updateDate = updateDate;
 	this.createBy = createBy;
@@ -127,8 +130,9 @@
 	this.videoRecorderSessions = videoRecorderSessions;
 	this.allowUseVoice = allowUseVoice;
 	this.allowUseCamera = allowUseCamera;
-	this.allowLearnerVideoExport = allowLearnerVideoExport;
 	this.allowLearnerVideoVisibility = allowLearnerVideoVisibility;
+	this.exportOffline = exportOffline;
+	this.exportAll = exportAll;
     }
 
     // Property accessors
@@ -273,18 +277,6 @@
     }    
 
     /**
-     * @hibernate.property column="allow_learner_video_export" length="1"
-     * @return
-     */
-    public boolean isAllowLearnerVideoExport() {
-	return allowLearnerVideoExport;
-    }
-
-    public void setAllowLearnerVideoExport(boolean allowLearnerVideoExport) {
-	this.allowLearnerVideoExport = allowLearnerVideoExport;
-    }  
-
-    /**
      * @hibernate.property column="allow_comments" length="1"
      * @return
      */
@@ -307,8 +299,32 @@
     public void setAllowRatings(boolean allowRatings) {
 	this.allowRatings = allowRatings;
     }  
+
+    /**
+     * @hibernate.property column="export_offline" length="1"
+     * @return
+     */
+    public boolean isExportOffline() {
+	return exportOffline;
+    }
+
+    public void setExportOffline(boolean exportOffline) {
+	this.exportOffline = exportOffline;
+    }  
     
     /**
+     * @hibernate.property column="export_all" length="1"
+     * @return
+     */
+    public boolean isExportAll() {
+	return exportAll;
+    }
+
+    public void setExportAll(boolean exportAll) {
+	this.exportAll = exportAll;
+    }  
+    
+    /**
      * @hibernate.property column="online_instructions" length="65535"
      * 
      */
@@ -434,7 +450,6 @@
 	buffer.append("allowUseVoice").append("='").append(isAllowUseVoice()).append("' ");
 	buffer.append("allowUseCamera").append("='").append(isAllowUseCamera()).append("' ");
 	buffer.append("allowLearnerVideoVisibility").append("='").append(isAllowLearnerVideoVisibility()).append("' ");
-	buffer.append("allowLearnerVideoExport").append("='").append(isAllowLearnerVideoExport()).append("' ");
 	buffer.append("]");
 
 	return buffer.toString();
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderRecording.java
===================================================================
diff -u -r049932651d9d1c08ed1681df0a044d7f519a4215 -r42aa5319fbd33938828764c43dd0ab1ca80e2416
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderRecording.java	(.../VideoRecorderRecording.java)	(revision 049932651d9d1c08ed1681df0a044d7f519a4215)
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderRecording.java	(.../VideoRecorderRecording.java)	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
@@ -39,12 +39,14 @@
  * @hibernate.class table="tl_lavidr10_recording"
  */
 
-public class VideoRecorderRecording implements java.io.Serializable {
+public class VideoRecorderRecording implements java.io.Serializable, Cloneable{
 	
 	private static final long serialVersionUID = -3701664859818409197L;
 
 	// Fields
 	private Long uid;
+	
+    private Long toolContentId;
 
     private Date createDate;
 
@@ -75,6 +77,7 @@
 	}
 
 	public VideoRecorderRecording(VideoRecorderRecordingDTO recording, VideoRecorderSession videoRecorderSession) {
+		this.uid = recording.uid;
 		this.createDate = recording.createDate;
 		this.updateDate = recording.updateDate;
 		this.createBy = recording.createBy;
@@ -86,13 +89,29 @@
 		this.comments = VideoRecorderComment.getVideoRecorderComments(recording.comments);
 		this.videoRecorderSession = videoRecorderSession;
 		this.filename = recording.filename;
+		this.toolContentId = recording.toolContentId;
 	}
+	
+	public VideoRecorderRecording(VideoRecorderRecording recording){
+		this.uid = recording.uid;
+		this.createDate = new Date();
+		this.updateDate = new Date();
+		this.createBy = recording.createBy;
+		this.title = recording.title;
+		this.description = recording.description;
+		this.rating = recording.rating;
+		this.isJustSound = false;
+		this.ratings = null;
+		this.comments = null;
+		this.filename = recording.filename;
+		this.toolContentId = recording.toolContentId;
+	}
 
 	/** full constructor */
 	public VideoRecorderRecording(
 			Date createDate, Date updateDate, VideoRecorderUser createBy, String title, String description,
 			Float rating, Boolean isJustSound, Long videoRecorderUid, VideoRecorderSession videoRecorderSession, String filename,
-			Set ratings, Set comments) {
+			Set ratings, Set comments, Long toolContentId) {
 				
 		this.createDate = createDate;
 		this.updateDate = updateDate;
@@ -105,6 +124,7 @@
 		this.comments = comments;
 		this.videoRecorderSession = videoRecorderSession;
 		this.filename = filename;
+		this.toolContentId = toolContentId;
 	}
 
     // Property accessors
@@ -122,6 +142,19 @@
     }
 
     /**
+     * @hibernate.property column="tool_content_id"
+     * 
+     */
+
+    public Long getToolContentId() {
+	return toolContentId;
+    }
+
+    public void setToolContentId(Long toolContentId) {
+	this.toolContentId = toolContentId;
+    }
+    
+    /**
      * @hibernate.property column="create_date"
      * 
      */
@@ -327,4 +360,16 @@
 				+ (getUid() == null ? 0 : this.getUid().hashCode());
 		return result;
 	}
+	
+	public Object clone() {
+		Object obj = null;
+		try {
+			obj = super.clone();
+			((VideoRecorderRecording) obj).setUid(null);
+		} catch (CloneNotSupportedException e) {
+			return null;
+		}
+
+		return obj;
+	}
 }
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderSession.java
===================================================================
diff -u -r3d081de4a45da632ee6029251318fac795d41813 -r42aa5319fbd33938828764c43dd0ab1ca80e2416
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderSession.java	(.../VideoRecorderSession.java)	(revision 3d081de4a45da632ee6029251318fac795d41813)
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderSession.java	(.../VideoRecorderSession.java)	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
@@ -29,6 +29,7 @@
 import java.util.Set;
 
 import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.tool.videoRecorder.dto.VideoRecorderSessionDTO;
 
 /**
  * 
@@ -80,6 +81,11 @@
 		this.videoRecorder = videoRecorder;
 		this.videoRecorderUsers = videoRecorderUsers;
 	}
+	
+	public VideoRecorderSession(VideoRecorderSessionDTO videoRecorderSessionDTO) {
+		this.sessionId = videoRecorderSessionDTO.getSessionID();
+		this.sessionName = videoRecorderSessionDTO.getSessionName();
+	}
 
 	// Property accessors
 	/**
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/IVideoRecorderService.java
===================================================================
diff -u -r049932651d9d1c08ed1681df0a044d7f519a4215 -r42aa5319fbd33938828764c43dd0ab1ca80e2416
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/IVideoRecorderService.java	(.../IVideoRecorderService.java)	(revision 049932651d9d1c08ed1681df0a044d7f519a4215)
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/IVideoRecorderService.java	(.../IVideoRecorderService.java)	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
@@ -206,20 +206,36 @@
     /**
      * 
      * @param toolSessionId
+     * @param toolContentId
      * @return
      */
-    public List<VideoRecorderRecordingDTO> getRecordingsByToolSessionId(Long toolSessionId);
+    public List<VideoRecorderRecordingDTO> getRecordingsByToolSessionId(Long toolSessionId, Long toolContentId);
     
     /**
      * 
      * @param toolSessionId
-     * @paramuserId
+     * @param userId
+     * @param toolContentId
      * @return
      */
-    public List<VideoRecorderRecordingDTO> getRecordingsByToolSessionIdAndUserId(Long toolSessionId, Long userId);
+    public List<VideoRecorderRecordingDTO> getRecordingsByToolSessionIdAndUserId(Long toolSessionId, Long userId, Long toolContentId);
 
     /**
      * 
+     * @param toolContentId
+     * @return
+     */
+    public List<VideoRecorderRecordingDTO> getRecordingsByToolContentId(Long toolContentId);
+    
+    /**
+     * 
+     * @param toolContentId
+     * @return
+     */
+    public VideoRecorderRecording getFirstRecordingByToolContentId(Long toolContentId);
+    
+    /**
+     * 
      * @param videoRecorderRecording
      */
     public void saveOrUpdateVideoRecorderRecording(VideoRecorderRecording videoRecorderRecording); 
@@ -274,4 +290,6 @@
     public String getLanguageXML();
     
     public String getLanguageXMLForFCK();
+    
+    public String getMessage(String key);
 }
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/VideoRecorderService.java
===================================================================
diff -u -r049932651d9d1c08ed1681df0a044d7f519a4215 -r42aa5319fbd33938828764c43dd0ab1ca80e2416
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/VideoRecorderService.java	(.../VideoRecorderService.java)	(revision 049932651d9d1c08ed1681df0a044d7f519a4215)
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/VideoRecorderService.java	(.../VideoRecorderService.java)	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
@@ -30,6 +30,7 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.Hashtable;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
 import java.util.Set;
@@ -219,10 +220,24 @@
 	if (fromContentId != null) {
 	    fromContent = videoRecorderDAO.getByContentId(fromContentId);
 	}
+	
+	List<VideoRecorderRecording> list = videoRecorderRecordingDAO.getByToolContentId(fromContentId);
+	
+	VideoRecorderRecording vrr;
+	if(!list.isEmpty()){
+		vrr = list.get(0);
+		VideoRecorderRecording clonedRecording = new VideoRecorderRecording(vrr);
+		clonedRecording.setUid(null);
+		clonedRecording.setToolContentId(toContentId);
+		videoRecorderRecordingDAO.saveOrUpdate(clonedRecording);
+	}
+	
 	if (fromContent == null) {
 	    // create the fromContent using the default tool content
 	    fromContent = getDefaultContent();
 	}
+	
+	
 	VideoRecorder toContent = VideoRecorder.newInstance(fromContent, toContentId, videoRecorderToolContentHandler);
 	videoRecorderDAO.saveOrUpdate(toContent);
     }
@@ -451,18 +466,34 @@
     return VideoRecorderCommentDTO.getVideoRecorderCommentDTOs(list);
     }
     
-    public List<VideoRecorderRecordingDTO> getRecordingsByToolSessionId(Long toolSessionId){
+    public List<VideoRecorderRecordingDTO> getRecordingsByToolSessionId(Long toolSessionId, Long toolContentId){
     	List<VideoRecorderRecording> list = videoRecorderRecordingDAO.getByToolSessionId(toolSessionId);
+    	list.addAll(videoRecorderRecordingDAO.getByToolContentId(toolContentId));
     	
     	return VideoRecorderRecordingDTO.getVideoRecorderRecordingDTOs(list);
     }
     
-    public List<VideoRecorderRecordingDTO> getRecordingsByToolSessionIdAndUserId(Long toolSessionId, Long userId){
+    public List<VideoRecorderRecordingDTO> getRecordingsByToolSessionIdAndUserId(Long toolSessionId, Long userId, Long toolContentId){
     	List<VideoRecorderRecording> list = videoRecorderRecordingDAO.getBySessionAndUserIds(toolSessionId, userId);
+    	list.addAll(videoRecorderRecordingDAO.getByToolContentId(toolContentId));
     	
     	return VideoRecorderRecordingDTO.getVideoRecorderRecordingDTOs(list);
     }
     
+    public List<VideoRecorderRecordingDTO> getRecordingsByToolContentId(Long toolContentId){
+    	List<VideoRecorderRecording> list = videoRecorderRecordingDAO.getByToolContentId(toolContentId);
+    	return VideoRecorderRecordingDTO.getVideoRecorderRecordingDTOs(list);
+    }
+    
+    public VideoRecorderRecording getFirstRecordingByToolContentId(Long toolContentId){
+    	List<VideoRecorderRecording> list = videoRecorderRecordingDAO.getByToolContentId(toolContentId);
+    	if(!list.isEmpty()){
+    		return list.get(0);
+    	}else{
+    		return null;
+    	}
+    }
+    
     public VideoRecorderAttachment uploadFileToContent(Long toolContentId, FormFile file, String type) {
 	if (file == null || StringUtils.isEmpty(file.getFileName())) {
 	    throw new VideoRecorderException("Could not find upload file: " + file);
@@ -800,6 +831,8 @@
 		languageCollection.add(new String("videorecorder.enter.something.here"));
 		languageCollection.add(new String("videorecorder.message.sure.delete"));
 		languageCollection.add(new String("videorecorder.confirm"));
+		languageCollection.add(new String("videorecorder.update"));
+		languageCollection.add(new String("videorecorder.refresh"));
 		languageCollection.add(new String("videorecorder.web.application.not.available"));
 		languageCollection.add(new String("videorecorder.net.connection.not.connected"));
 		languageCollection.add(new String("videorecorder.net.connection.closed"));
@@ -809,6 +842,29 @@
 		languageCollection.add(new String("videorecorder.recording"));
 		languageCollection.add(new String("videorecorder.buffering"));
 		languageCollection.add(new String("videorecorder.waiting"));
+		languageCollection.add(new String("videorecorder.tooltip.sort.author"));
+		languageCollection.add(new String("videorecorder.tooltip.sort.title"));
+		languageCollection.add(new String("videorecorder.tooltip.sort.date"));
+		languageCollection.add(new String("videorecorder.tooltip.play"));
+		languageCollection.add(new String("videorecorder.tooltip.pause"));
+		languageCollection.add(new String("videorecorder.tooltip.resume"));
+		languageCollection.add(new String("videorecorder.tooltip.start.camera"));
+		languageCollection.add(new String("videorecorder.tooltip.stop.camera"));
+		languageCollection.add(new String("videorecorder.tooltip.add.comment"));
+		languageCollection.add(new String("videorecorder.tooltip.add.rating"));
+		languageCollection.add(new String("videorecorder.tooltip.refresh"));
+		languageCollection.add(new String("videorecorder.tooltip.save.recording"));
+		languageCollection.add(new String("videorecorder.tooltip.save.comment"));
+		languageCollection.add(new String("videorecorder.tooltip.cancel.comment"));
+		languageCollection.add(new String("videorecorder.tooltip.start.recording"));
+		languageCollection.add(new String("videorecorder.tooltip.stop.recording"));
+		languageCollection.add(new String("videorecorder.tooltip.delete.recording"));
+		languageCollection.add(new String("videorecorder.tooltip.export.recording"));
+		languageCollection.add(new String("videorecorder.tooltip.click.to.ready.recording"));
+		languageCollection.add(new String("videorecorder.tooltip.rate.recording"));
+		languageCollection.add(new String("videorecorder.tooltip.already.rated"));
+		languageCollection.add(new String("videorecorder.disabled"));
+		
 		String languageOutput = "<xml><language>";
 		
 		for(int i = 0; i < languageCollection.size(); i++){
@@ -822,6 +878,11 @@
 	
 	public String getLanguageXMLForFCK(){
 		ArrayList<String> languageCollection = new ArrayList<String>();
+		languageCollection.add(new String("button.ok"));
+		languageCollection.add(new String("button.save"));
+		languageCollection.add(new String("button.cancel"));
+		languageCollection.add(new String("button.yes"));
+		languageCollection.add(new String("button.no"));
 		languageCollection.add(new String("videorecorder.video.player"));
 		languageCollection.add(new String("videorecorder.video.recorder"));
 		languageCollection.add(new String("videorecorder.web.application.not.available"));
@@ -833,6 +894,22 @@
 		languageCollection.add(new String("videorecorder.recording"));
 		languageCollection.add(new String("videorecorder.buffering"));
 		languageCollection.add(new String("videorecorder.waiting"));
+		languageCollection.add(new String("videorecorder.description"));
+		languageCollection.add(new String("videorecorder.title"));
+		languageCollection.add(new String("videorecorder.new.recording.details"));
+		languageCollection.add(new String("videorecorder.recording.complete.authoring"));
+		languageCollection.add(new String("videorecorder.enter.something.here"));
+		languageCollection.add(new String("videorecorder.recording.complete.fck"));
+		languageCollection.add(new String("videorecorder.tooltip.play"));
+		languageCollection.add(new String("videorecorder.tooltip.pause"));
+		languageCollection.add(new String("videorecorder.tooltip.resume"));
+		languageCollection.add(new String("videorecorder.tooltip.save.recording"));
+		languageCollection.add(new String("videorecorder.tooltip.start.recording"));
+		languageCollection.add(new String("videorecorder.tooltip.start.recording.again"));
+		languageCollection.add(new String("videorecorder.tooltip.start.recording.next"));
+		languageCollection.add(new String("videorecorder.tooltip.stop.recording"));
+		languageCollection.add(new String("videorecorder.disabled"));
+		
 		String languageOutput = "<xml><language>";
 		
 		for(int i = 0; i < languageCollection.size(); i++){
@@ -843,4 +920,8 @@
 		
 		return languageOutput;
 	}
-}
+	
+	public String getMessage(String key){
+		return messageService.getMessage(key);
+	}
+}
\ No newline at end of file
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/util/VideoRecorderRecordingComparator.java
===================================================================
diff -u -r049932651d9d1c08ed1681df0a044d7f519a4215 -r42aa5319fbd33938828764c43dd0ab1ca80e2416
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/util/VideoRecorderRecordingComparator.java	(.../VideoRecorderRecordingComparator.java)	(revision 049932651d9d1c08ed1681df0a044d7f519a4215)
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/util/VideoRecorderRecordingComparator.java	(.../VideoRecorderRecordingComparator.java)	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
@@ -4,6 +4,7 @@
 import java.util.Date;
 
 import org.lamsfoundation.lams.tool.videoRecorder.dto.VideoRecorderRecordingDTO;
+import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderUser;
 
 /**
  * 
@@ -22,9 +23,18 @@
 	
 	public int compare(VideoRecorderRecordingDTO dto1, VideoRecorderRecordingDTO dto2) {
 		if(sortBy.compareTo("author") == 0){
-			Long userId1 = dto1.getCreateBy().getUid();
-			Long userId2 = dto2.getCreateBy().getUid();
+			VideoRecorderUser user1 = dto1.getCreateBy();
+			VideoRecorderUser user2 = dto2.getCreateBy();
 			
+			if(user1 == null)
+				return -1;
+			
+			if(user2 == null)
+				return 1;
+			
+			Long userId1 = user1.getUid();
+			Long userId2 = user2.getUid();
+				
 			if(userId1 > userId2) {
 				if(sortDirection == "ascending")
 					return -1;
@@ -40,32 +50,57 @@
 			}
 		}
 		else if(sortBy.compareTo("date") == 0){
+			VideoRecorderUser user1 = dto1.getCreateBy();
+			VideoRecorderUser user2 = dto2.getCreateBy();
+			
+			if(user1 == null)
+				return -1;
+			
+			if(user2 == null)
+				return 1;
+			
 			Date date1 = dto1.getCreateDate();
 			Date date2 = dto2.getCreateDate();
 			
+			int difference = date1.compareTo(date2);
+			
+			if(Math.abs(difference) == 0)
+				return 1;
+			
 			if(sortDirection.compareTo("ascending") == 0){
-				int difference = date1.compareTo(date2);
 				int result = difference / Math.abs(difference);
 				return result;
 			}
 			else if(sortDirection.compareTo("descending") == 0){
-				int difference = date1.compareTo(date2);
 				int result = -difference / Math.abs(difference);
 				return result;
 			}
 			
 		}
 		else if(sortBy.compareTo("title") == 0){
+			VideoRecorderUser user1 = dto1.getCreateBy();
+			VideoRecorderUser user2 = dto2.getCreateBy();
+			
+			if(user1 == null)
+				return -1;
+			
+			if(user2 == null)
+				return 1;
+			
 			String title1 = dto1.getTitle();
 			String title2 = dto2.getTitle();
 			
+			int difference = title1.compareTo(title2);
+			
+			if(Math.abs(difference) == 0)
+				return 1;
+			
 			if(sortDirection.compareTo("ascending") == 0){
-				int difference = title1.compareTo(title2);
+				
 				int result = difference / Math.abs(difference);
 				return result;
 			}
 			else if(sortDirection.compareTo("descending") == 0){
-				int difference = title1.compareTo(title2);
 				int result = -difference / Math.abs(difference);
 				return result;
 			}
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/AuthoringAction.java
===================================================================
diff -u -r049932651d9d1c08ed1681df0a044d7f519a4215 -r42aa5319fbd33938828764c43dd0ab1ca80e2416
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 049932651d9d1c08ed1681df0a044d7f519a4215)
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
@@ -36,6 +36,7 @@
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
@@ -48,16 +49,25 @@
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.learningdesign.TextSearchConditionComparator;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
+import org.lamsfoundation.lams.tool.ToolSessionManager;
+import org.lamsfoundation.lams.tool.videoRecorder.dto.VideoRecorderDTO;
+import org.lamsfoundation.lams.tool.videoRecorder.dto.VideoRecorderRecordingDTO;
+import org.lamsfoundation.lams.tool.videoRecorder.dto.VideoRecorderSessionDTO;
 import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorder;
 import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderAttachment;
 import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderCondition;
+import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderSession;
+import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderUser;
 import org.lamsfoundation.lams.tool.videoRecorder.service.IVideoRecorderService;
+import org.lamsfoundation.lams.tool.videoRecorder.service.VideoRecorderService;
 import org.lamsfoundation.lams.tool.videoRecorder.service.VideoRecorderServiceProxy;
 import org.lamsfoundation.lams.tool.videoRecorder.util.VideoRecorderConstants;
 import org.lamsfoundation.lams.tool.videoRecorder.web.forms.AuthoringForm;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.FileValidatorUtil;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
+import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.lamsfoundation.lams.web.util.SessionMap;
 
@@ -98,6 +108,12 @@
 	// Extract toolContentID from parameters.
 	Long toolContentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID));
 
+	// get httpsession
+	HttpSession ss = SessionManager.getSession();
+	
+	// get LAMS user
+	UserDTO user = (UserDTO)ss.getAttribute(AttributeNames.USER);
+	
 	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
 
 	ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, "mode", true);
@@ -106,7 +122,10 @@
 	if (videoRecorderService == null) {
 	    videoRecorderService = VideoRecorderServiceProxy.getVideoRecorderService(this.getServlet().getServletContext());
 	}
-
+	
+	// get toolSessionManager
+	ToolSessionManager toolSessionManager =VideoRecorderServiceProxy.getVideoRecorderSessionManager(this.getServlet().getServletContext());
+	
 	// retrieving VideoRecorder with given toolContentID
 	VideoRecorder videoRecorder = videoRecorderService.getVideoRecorderByContentId(toolContentID);
 	if (videoRecorder == null) {
@@ -115,7 +134,25 @@
 	    videoRecorderService.saveOrUpdateVideoRecorder(videoRecorder);
 	    // TODO NOTE: this causes DB orphans when LD not saved.
 	}
-
+	
+	// transform to dto
+	VideoRecorderDTO videoRecorderDT0 = new VideoRecorderDTO(videoRecorder);
+	
+	// get recordings
+	List<VideoRecorderRecordingDTO> recordings = videoRecorderService.getRecordingsByToolContentId(toolContentID);
+	
+	// setup first recording
+	VideoRecorderRecordingDTO firstRecording = null;
+	
+	// if there are recordings
+	if(!recordings.isEmpty()){
+		// fetch the first one
+		firstRecording = recordings.get(0);
+	}
+	
+	// add it to the request
+	request.setAttribute("videoRecorderRecordingDTO", firstRecording);
+	
 	if (mode != null && mode.isTeacher()) {
 	    // Set the defineLater flag so that learners cannot use content
 	    // while we
@@ -133,9 +170,18 @@
 		toolContentID);
 	authForm.setSessionMapID(map.getSessionID());
 
-	// add the sessionMap to HTTPSession.
+	// add the sessionMap to HTTPSession
 	request.getSession().setAttribute(map.getSessionID(), map);
 	request.setAttribute(VideoRecorderConstants.ATTR_SESSION_MAP, map);
+	
+	// add the toolContentId
+	request.setAttribute("toolContentId", toolContentID);
+	
+	// add the videoRecorderDTO
+	request.setAttribute("videoRecorderDTO", videoRecorderDT0);
+	
+	// set language xml
+	request.setAttribute("languageXML", videoRecorderService.getLanguageXMLForFCK());
 
 	return mapping.findForward("success");
     }
@@ -384,9 +430,10 @@
 	    videoRecorder.setAllowUseVoice(authForm.isAllowUseVoice());
 	    videoRecorder.setAllowUseCamera(authForm.isAllowUseCamera());
 	    videoRecorder.setAllowLearnerVideoVisibility(authForm.isAllowLearnerVideoVisibility());
-	    videoRecorder.setAllowLearnerVideoExport(authForm.isAllowLearnerVideoExport());
 	    videoRecorder.setAllowComments(authForm.isAllowComments());
 	    videoRecorder.setAllowRatings(authForm.isAllowComments());
+	    videoRecorder.setExportAll(authForm.isExportAll());
+	    videoRecorder.setExportOffline(authForm.isExportOffline());
 	//}
     }
 
@@ -406,9 +453,10 @@
 	authForm.setAllowUseVoice(videoRecorder.isAllowUseVoice());
 	authForm.setAllowUseCamera(videoRecorder.isAllowUseCamera());
 	authForm.setAllowLearnerVideoVisibility(videoRecorder.isAllowLearnerVideoVisibility());
-	authForm.setAllowLearnerVideoExport(videoRecorder.isAllowLearnerVideoExport());
 	authForm.setAllowComments(videoRecorder.isAllowComments());
 	authForm.setAllowRatings(videoRecorder.isAllowComments());
+	authForm.setExportAll(videoRecorder.isExportAll());
+	authForm.setExportOffline(videoRecorder.isExportOffline());
     }
 
     /**
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/LearningAction.java
===================================================================
diff -u -r049932651d9d1c08ed1681df0a044d7f519a4215 -r42aa5319fbd33938828764c43dd0ab1ca80e2416
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 049932651d9d1c08ed1681df0a044d7f519a4215)
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
@@ -79,7 +79,7 @@
 	public ActionForward unspecified(ActionMapping mapping, ActionForm form,
 			HttpServletRequest request, HttpServletResponse response)
 			throws Exception {
-
+				
 		LearningForm learningForm = (LearningForm) form;
 
 		// 'toolSessionID' and 'mode' paramters are expected to be present.
@@ -107,6 +107,8 @@
 
 		VideoRecorder videoRecorder = videoRecorderSession.getVideoRecorder();
 
+		Long toolContentID = videoRecorder.getToolContentId();
+
 		// check defineLater
 		if (videoRecorder.isDefineLater()) {
 			return mapping.findForward("defineLater");
@@ -122,12 +124,16 @@
 		
 		VideoRecorderDTO videoRecorderDT0 = new VideoRecorderDTO(videoRecorder);
 		
+		VideoRecorderUserDTO videoRecorderUserDTO = new VideoRecorderUserDTO(videoRecorderUser);
+		
 		// set mode, toolSessionID and userId
 		request.setAttribute("mode", mode.toString());
+		request.setAttribute("videoRecorderUserDTO", videoRecorderUserDTO);
 		request.setAttribute("userId", videoRecorderUser.getUid());
 		request.setAttribute("videoRecorderDTO", videoRecorderDT0);
 		learningForm.setToolSessionID(toolSessionID);
 		request.setAttribute("toolSessionId", toolSessionID);
+		request.setAttribute("toolContentId", toolContentID);
 		
 		// set language xml
 		request.setAttribute("languageXML", videoRecorderService.getLanguageXML());
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/MonitoringAction.java
===================================================================
diff -u -r049932651d9d1c08ed1681df0a044d7f519a4215 -r42aa5319fbd33938828764c43dd0ab1ca80e2416
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision 049932651d9d1c08ed1681df0a044d7f519a4215)
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
@@ -123,6 +123,7 @@
 		request.setAttribute("mode", "author");
 		request.setAttribute("userId", videoRecorderUser.getUid());
 		request.setAttribute("toolSessionId", toolSessionID);
+		request.setAttribute("toolContentId", toolContentID);
 		request.setAttribute("videoRecorderDTO", videoRecorderDT0);
 		request.setAttribute("contentFolderID", contentFolderID);
 		
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/forms/AuthoringForm.java
===================================================================
diff -u -r049932651d9d1c08ed1681df0a044d7f519a4215 -r42aa5319fbd33938828764c43dd0ab1ca80e2416
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/forms/AuthoringForm.java	(.../AuthoringForm.java)	(revision 049932651d9d1c08ed1681df0a044d7f519a4215)
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/forms/AuthoringForm.java	(.../AuthoringForm.java)	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
@@ -57,15 +57,17 @@
 	boolean allowUseVoice;
 	
 	boolean allowUseCamera;
-	
-	boolean allowLearnerVideoExport;
-	
+		
 	boolean allowLearnerVideoVisibility;
 	
 	boolean allowComments;
 	
 	boolean allowRatings;
 	
+	boolean exportAll;
+	
+	boolean exportOffline;
+	
 	FormFile onlineFile; 
 
 	FormFile offlineFile;
@@ -207,15 +209,7 @@
 	public void setAllowLearnerVideoVisibility(boolean allowLearnerVideoVisibility) {
 		this.allowLearnerVideoVisibility = allowLearnerVideoVisibility;
 	}
-	
-	public boolean isAllowLearnerVideoExport() {
-		return allowLearnerVideoExport;
-	}
-
-	public void setAllowLearnerVideoExport(boolean allowLearnerVideoExport) {
-		this.allowLearnerVideoExport = allowLearnerVideoExport;
-	}
-	
+		
 	public boolean isAllowComments() {
 		return allowComments;
 	}
@@ -231,4 +225,20 @@
 	public void setAllowRatings(boolean allowRatings) {
 		this.allowRatings = allowRatings;
 	}
+
+	public boolean isExportAll() {
+		return exportAll;
+	}
+
+	public void setExportAll(boolean exportAll) {
+		this.exportAll = exportAll;
+	}
+	
+	public boolean isExportOffline() {
+		return exportOffline;
+	}
+
+	public void setExportOffline(boolean exportOffline) {
+		this.exportOffline = exportOffline;
+	}
 }
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/servlets/ExportServlet.java
===================================================================
diff -u -r049932651d9d1c08ed1681df0a044d7f519a4215 -r42aa5319fbd33938828764c43dd0ab1ca80e2416
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/servlets/ExportServlet.java	(.../ExportServlet.java)	(revision 049932651d9d1c08ed1681df0a044d7f519a4215)
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/servlets/ExportServlet.java	(.../ExportServlet.java)	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
@@ -33,6 +33,8 @@
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -48,22 +50,20 @@
 import org.lamsfoundation.lams.learning.export.web.action.MultipleDirFileBundler;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
-import org.lamsfoundation.lams.tool.exception.ToolException;
 import org.lamsfoundation.lams.tool.videoRecorder.dto.VideoRecorderDTO;
 import org.lamsfoundation.lams.tool.videoRecorder.dto.VideoRecorderRecordingDTO;
-import org.lamsfoundation.lams.tool.videoRecorder.dto.VideoRecorderSessionDTO;
 import org.lamsfoundation.lams.tool.videoRecorder.dto.VideoRecorderUserDTO;
 import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorder;
-import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderRecording;
 import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderSession;
 import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderUser;
 import org.lamsfoundation.lams.tool.videoRecorder.service.IVideoRecorderService;
 import org.lamsfoundation.lams.tool.videoRecorder.service.VideoRecorderServiceProxy;
 import org.lamsfoundation.lams.tool.videoRecorder.util.VideoRecorderException;
+import org.lamsfoundation.lams.tool.videoRecorder.util.VideoRecorderRecordingComparator;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.Configuration;
 import org.lamsfoundation.lams.util.ConfigurationKeys;
-import org.lamsfoundation.lams.util.FileUtil;
+import org.lamsfoundation.lams.util.ExternalServerUtil;
 import org.lamsfoundation.lams.web.servlet.AbstractExportPortfolioServlet;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
@@ -77,7 +77,8 @@
 	private final String FILENAME = "videoRecorder_main.html";
 	public static final String VIDEORECORDER_INCLUDES_HTTP_FOLDER_URL = Configuration.get(ConfigurationKeys.SERVER_URL) + "tool/lavidr10/includes/flash/";
 	public static final String VIDEORECORDER_RECORDINGS_HTTP_FOLDER_URL = Configuration.get(ConfigurationKeys.SERVER_URL) + "tool/lavidr10/recordings/";
-	public static final String VIDEORECORDER_RECORDINGS_FOLDER_URL = Configuration.get(ConfigurationKeys.LAMS_EAR_DIR) + "/" + "lams-tool-lavidr10.war" + "/" + "recordings" + "/";
+	public static final String VIDEORECORDER_RECORDINGS_FOLDER_DEST = Configuration.get(ConfigurationKeys.LAMS_EAR_DIR) + "/" + "lams-tool-lavidr10.war" + "/" + "recordings" + "/";
+	public static final String VIDEORECORDER_RECORDINGS_FOLDER_SRC = Configuration.get(ConfigurationKeys.RED5_RECORDINGS_URL);
 
 	private IVideoRecorderService videoRecorderService;
 
@@ -88,7 +89,9 @@
 			videoRecorderService = VideoRecorderServiceProxy
 					.getVideoRecorderService(getServletContext());
 		}
-
+		
+		toolSessionID = new Long(request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID));
+		
 		try {
 			if (StringUtils.equals(mode, ToolAccessMode.LEARNER.toString())) {
 				request.getSession().setAttribute(AttributeNames.ATTR_MODE,
@@ -147,83 +150,82 @@
 			logger.error(error);
 			throw new VideoRecorderException(error);
 		}
-
+		
+		// get the session from the toolSessionId
 		VideoRecorderSession videoRecorderSession = videoRecorderService
 				.getSessionBySessionId(toolSessionID);
 
+		// get the video recorder from the session		
 		VideoRecorder videoRecorder = videoRecorderSession.getVideoRecorder();
+		
+		// get toolContentId from video recorder
+		toolContentID = videoRecorder.getToolContentId();
+		
+		/*
+		// get videorecorder from toolContentId
+		VideoRecorder videoRecorder = videoRecorderService.getVideoRecorderByContentId(toolContentID);
+		*/
+		
+		// get export options
+		boolean exportAll = videoRecorder.isExportAll();
+		boolean exportOffline = videoRecorder.isExportOffline();
+				
+		// transform to dto
 		VideoRecorderDTO videoRecorderDTO = new VideoRecorderDTO(videoRecorder);
 
+		// get lams user from session
 		UserDTO lamsUserDTO = (UserDTO) SessionManager.getSession()
 				.getAttribute(AttributeNames.USER);
 
+		// get video recorder user from userId and sessionId
 		VideoRecorderUser videoRecorderUser = videoRecorderService
 				.getUserByUserIdAndSessionId(new Long(lamsUserDTO.getUserID()),
 						toolSessionID);
 		
+		// transform to dto
 		VideoRecorderUserDTO videoRecorderUserDTO = new VideoRecorderUserDTO(videoRecorderUser);
-
-		List<VideoRecorderRecordingDTO> videoRecorderRecordingDTOs = videoRecorderService.getRecordingsByToolSessionIdAndUserId(toolSessionID, videoRecorderUser.getUid());
 		
+		// get the video recording dtos
+		List<VideoRecorderRecordingDTO> videoRecorderRecordingDTOs;
+		
+		// get video recording dtos
+		if(exportAll)
+		{
+			videoRecorderRecordingDTOs = videoRecorderService.getRecordingsByToolSessionId(toolSessionID, toolContentID);
+		}else{
+			videoRecorderRecordingDTOs = videoRecorderService.getRecordingsByToolSessionIdAndUserId(toolSessionID, videoRecorderUser.getUid(), toolContentID);
+		}
+		
+		// sort the list of recording dtos in order to create the xml correctly
+		Comparator<VideoRecorderRecordingDTO> comp = new VideoRecorderRecordingComparator("author", "ascending");
+	    Collections.sort(videoRecorderRecordingDTOs, comp);
+	    
+	    // get the nb of recordings
 		int nbRecordings = videoRecorderRecordingDTOs.size();
 		
+		// set dtos to request (used in export jsp)
 		request.getSession().setAttribute("videoRecorderDTO", videoRecorderDTO);
 		request.getSession().setAttribute("videoRecorderUserDTO", videoRecorderUserDTO);
 		request.getSession().setAttribute("videoRecorderRecordingDTOs", videoRecorderRecordingDTOs);
 		
-		// set language xml
+		// set language xml to request
 		request.getSession().setAttribute("languageXML", videoRecorderService.getLanguageXMLForFCK());
 		
-		// set red5 server url
+		// set red5 server url to request
 		String red5ServerUrl = Configuration.get(ConfigurationKeys.RED5_SERVER_URL);
 		request.getSession().setAttribute("red5ServerUrl", red5ServerUrl);
 		
-		// set LAMS server url
+		// set LAMS server url to request
 		String serverUrl = Configuration.get(ConfigurationKeys.SERVER_URL);
 		request.getSession().setAttribute("serverUrl", serverUrl);
 		
-		ArrayList<String>[] fileArray = new ArrayList[2];
-		fileArray[0] = new ArrayList<String>();
-		fileArray[1] = new ArrayList<String>();
-
-		fileArray[0].add("VideoRecorderFCKEditor.swf");
-		fileArray[0].add("playerProductInstall.swf");
-		fileArray[0].add("AC_OETags.js");
-		
-		try {
-			Iterator<VideoRecorderRecordingDTO> iter = videoRecorderRecordingDTOs.iterator();
-			while(iter.hasNext()){
-				VideoRecorderRecordingDTO vr = (VideoRecorderRecordingDTO) iter.next();
-			    InputStream is = getResponseInputStreamFromExternalServer("http://172.20.100.22:8080/streams/" + vr.getFilename(), new HashMap<String, String>());
-	
-			    File imageFile = new File(VIDEORECORDER_RECORDINGS_FOLDER_URL + vr.getFilename());
-			    
-			    FileOutputStream out = new FileOutputStream(imageFile);
-
-			    byte[] buf = new byte[10 * 1024];
-			    int len;
-			    while ((len = is.read(buf)) > 0) {
-			    	out.write(buf, 0, len);
-			    }
-			    
-			    out.close();
-			    
-			    fileArray[1].add(vr.getFilename());
-			}
-		} catch (Exception e) {
-			logger.error("Could not find files on Red5 server", e);
+		// if doing export offline, copy recordings files
+		if(exportOffline){
+			bundleFilesForOffline(request, response, directoryName, cookies, videoRecorderRecordingDTOs);
 		}
-
-		// bundling files
-		try {
-			String[] urls = new String[2];
-			urls[0] = VIDEORECORDER_INCLUDES_HTTP_FOLDER_URL;
-			urls[1] = VIDEORECORDER_RECORDINGS_HTTP_FOLDER_URL;
-			
-			MultipleDirFileBundler fileBundler = new MultipleDirFileBundler();
-		    fileBundler.bundle(request, cookies, directoryName, urls, fileArray);
-		} catch (Exception e) {
-			logger.error("Could not bundle files", e);
+		// otherwise, just copy files (like js)
+		else{
+			bundleFilesForOnline(request, response, directoryName, cookies, videoRecorderRecordingDTOs);
 		}
 	}
 
@@ -234,75 +236,113 @@
 		logger.debug("doExportTeacher: toolContentID:" + toolContentID);
 
 		// check if toolContentID available
-		if (toolSessionID == null) {
-			String error = "Tool Session ID is missing. Unable to continue";
+		if (toolContentID == null) {
+			String error = "Tool Content ID is missing. Unable to continue";
 			logger.error(error);
 			throw new VideoRecorderException(error);
 		}
-
-		VideoRecorderSession videoRecorderSession = videoRecorderService
-				.getSessionBySessionId(toolSessionID);
-
-		VideoRecorder videoRecorder = videoRecorderSession.getVideoRecorder();
+		
+		// get video recorder from tool content id
+		VideoRecorder videoRecorder = videoRecorderService.getVideoRecorderByContentId(toolContentID);
+		
+		// make into dto
 		VideoRecorderDTO videoRecorderDTO = new VideoRecorderDTO(videoRecorder);
 		
+		// get export options
+		boolean exportAll = videoRecorder.isExportAll();
+		boolean exportOffline = videoRecorder.isExportOffline();
+				
+		// get lams user from session
 		UserDTO lamsUserDTO = (UserDTO) SessionManager.getSession()
 				.getAttribute(AttributeNames.USER);
-
-		VideoRecorderUser videoRecorderUser = videoRecorderService
-				.getUserByUserIdAndSessionId(new Long(lamsUserDTO.getUserID()),
-						toolSessionID);
 		
-		VideoRecorderUserDTO videoRecorderUserDTO = new VideoRecorderUserDTO(videoRecorderUser);
-
-		List<VideoRecorderRecordingDTO> videoRecorderRecordingDTOs = videoRecorderService.getRecordingsByToolSessionId(toolSessionID);
+		// get video recording dtos from just tool content id
+		List<VideoRecorderRecordingDTO> videoRecorderRecordingDTOs = videoRecorderService.getRecordingsByToolSessionId(new Long(0), toolContentID);
 		
+		// get nb of recordings
 		int nbRecordings = videoRecorderRecordingDTOs.size();
 		
+		// add dtos to request
 		request.getSession().setAttribute("videoRecorderDTO", videoRecorderDTO);
-		request.getSession().setAttribute("videoRecorderUserDTO", videoRecorderUserDTO);
 		request.getSession().setAttribute("videoRecorderRecordingDTOs", videoRecorderRecordingDTOs);
 		
-		// set language xml
+		// set language xml to request
 		request.getSession().setAttribute("languageXML", videoRecorderService.getLanguageXMLForFCK());
 		
-		// set red5 server url
+		// set red5 server url to request
 		String red5ServerUrl = Configuration.get(ConfigurationKeys.RED5_SERVER_URL);
 		request.getSession().setAttribute("red5ServerUrl", red5ServerUrl);
 		
-		// set LAMS server url
+		// set LAMS server url to request
 		String serverUrl = Configuration.get(ConfigurationKeys.SERVER_URL);
 		request.getSession().setAttribute("serverUrl", serverUrl);
 		
+		// if doing export offline, copy recordings files
+		if(exportOffline){
+			bundleFilesForOffline(request, response, directoryName, cookies, videoRecorderRecordingDTOs);
+		}
+		// otherwise, just copy files (like js)
+		else{
+			bundleFilesForOnline(request, response, directoryName, cookies, videoRecorderRecordingDTOs);
+		}
+	}
+	
+	private void bundleFilesForOnline(HttpServletRequest request,
+			HttpServletResponse response, String directoryName, Cookie[] cookies,
+			List<VideoRecorderRecordingDTO> videoRecorderRecordingDTOs){
+		// prepare the file array
+		// index 0 is for the files from VIDEORECORDER_INCLUDES_HTTP_FOLDER_URL
+		ArrayList<String>[] fileArray = new ArrayList[1];
+		fileArray[0] = new ArrayList<String>();
+
+		// add the files need from VIDEORECORDER_INCLUDES_HTTP_FOLDER_URL
+		fileArray[0].add("VideoRecorderFCKEditor.swf");
+		fileArray[0].add("playerProductInstall.swf");
+		fileArray[0].add("AC_OETags.js");
+		
+		// bundling files
+		try {
+			String[] urls = new String[1];
+			urls[0] = VIDEORECORDER_INCLUDES_HTTP_FOLDER_URL;
+			
+			MultipleDirFileBundler fileBundler = new MultipleDirFileBundler();
+		    fileBundler.bundle(request, cookies, directoryName, urls, fileArray);
+		} catch (Exception e) {
+			logger.error("Could not bundle files", e);
+		}
+	}
+	
+	private void bundleFilesForOffline(HttpServletRequest request,
+			HttpServletResponse response, String directoryName, Cookie[] cookies,
+			List<VideoRecorderRecordingDTO> videoRecorderRecordingDTOs){
+		// prepare the file array
+		// index 0 is for the files from VIDEORECORDER_INCLUDES_HTTP_FOLDER_URL
+		// index 1 is for the files from VIDEORECORDER_RECORDINGS_HTTP_FOLDER_URL
 		ArrayList<String>[] fileArray = new ArrayList[2];
+		fileArray[0] = new ArrayList<String>();
+		fileArray[1] = new ArrayList<String>();
 
+		// add the files need from VIDEORECORDER_INCLUDES_HTTP_FOLDER_URL
 		fileArray[0].add("VideoRecorderFCKEditor.swf");
 		fileArray[0].add("playerProductInstall.swf");
 		fileArray[0].add("AC_OETags.js");
 		
+		// add the files from VIDEORECORDER_RECORDINGS_HTTP_FOLDER_URL
 		try {
-			int counter = 3;
-			int listSize = videoRecorderRecordingDTOs.size();
+			// for each video recording
 			Iterator<VideoRecorderRecordingDTO> iter = videoRecorderRecordingDTOs.iterator();
 			while(iter.hasNext()){
+				// get the video recording
 				VideoRecorderRecordingDTO vr = (VideoRecorderRecordingDTO) iter.next();
-			    InputStream is = getResponseInputStreamFromExternalServer("http://172.20.100.22:8080/streams/" + vr.getFilename(), new HashMap<String, String>());
-	
-			    File imageFile = new File(VIDEORECORDER_RECORDINGS_FOLDER_URL + vr.getFilename());
+				
+				// get the stream from the external server
+			    InputStream is = ExternalServerUtil.getResponseInputStreamFromExternalServer(VIDEORECORDER_RECORDINGS_FOLDER_SRC + vr.getFilename(), new HashMap<String, String>());
 			    
-			    FileOutputStream out = new FileOutputStream(imageFile);
-
-			    byte[] buf = new byte[10 * 1024];
-			    int len;
-			    while ((len = is.read(buf)) > 0) {
-			    	out.write(buf, 0, len);
-			    }
+			    // write the flv file locally
+			    File file = ExternalServerUtil.writeFile(is, VIDEORECORDER_RECORDINGS_FOLDER_DEST + vr.getFilename());
 			    
-			    out.close();
-			    
+			    // add the filename to the list
 			    fileArray[1].add(vr.getFilename());
-			    
-			    counter++;
 			}
 		} catch (Exception e) {
 			logger.error("Could not find files on Red5 server", e);
@@ -312,47 +352,12 @@
 		try {
 			String[] urls = new String[2];
 			urls[0] = VIDEORECORDER_INCLUDES_HTTP_FOLDER_URL;
-			urls[1] = VIDEORECORDER_RECORDINGS_FOLDER_URL;
+			urls[1] = VIDEORECORDER_RECORDINGS_HTTP_FOLDER_URL;
 			
 			MultipleDirFileBundler fileBundler = new MultipleDirFileBundler();
 		    fileBundler.bundle(request, cookies, directoryName, urls, fileArray);
 		} catch (Exception e) {
 			logger.error("Could not bundle files", e);
 		}
 	}
-
-    public static InputStream getResponseInputStreamFromExternalServer(String urlStr, HashMap<String, String> params)
-    throws ToolException, IOException {
-		if (!urlStr.endsWith("?"))
-		    urlStr += "?";
-		
-		for (Entry<String, String> entry : params.entrySet()) {
-		    urlStr += "&" + entry.getKey() + "=" + entry.getValue();
-		}
-		
-		logger.debug("Making request to external servlet: " + urlStr);
-		
-		URL url = new URL(urlStr);
-		URLConnection conn = url.openConnection();
-		if (!(conn instanceof HttpURLConnection)) {
-		    logger.error("Fail to connect to external server though url:  " + urlStr);
-		    throw new ToolException("Fail to connect to external server though url:  " + urlStr);
-		}
-		
-		HttpURLConnection httpConn = (HttpURLConnection) conn;
-		if (httpConn.getResponseCode() != HttpURLConnection.HTTP_OK) {
-		    logger.error("Fail to fetch data from external server, response code:  " + httpConn.getResponseCode()
-			    + " Url: " + urlStr);
-		    throw new ToolException("Fail to fetch data from external server, response code:  "
-			    + httpConn.getResponseCode() + " Url: " + urlStr);
-		}
-		
-		InputStream is = url.openConnection().getInputStream();
-		if (is == null) {
-		    logger.error("Fail to fetch data from external server, return InputStream null:  " + urlStr);
-		    throw new ToolException("Fail to fetch data from external server, return inputStream null:  " + urlStr);
-		}
-		
-		return is;
-	}
 }
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/servlets/VideoRecorderAction.java
===================================================================
diff -u -r049932651d9d1c08ed1681df0a044d7f519a4215 -r42aa5319fbd33938828764c43dd0ab1ca80e2416
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/servlets/VideoRecorderAction.java	(.../VideoRecorderAction.java)	(revision 049932651d9d1c08ed1681df0a044d7f519a4215)
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/servlets/VideoRecorderAction.java	(.../VideoRecorderAction.java)	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
@@ -29,10 +29,12 @@
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.PrintWriter;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
 
@@ -46,12 +48,14 @@
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
+import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorder;
 import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderComment;
 import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderRating;
 import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderRecording;
 import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderSession;
 import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderUser;
 import org.lamsfoundation.lams.tool.videoRecorder.service.IVideoRecorderService;
+import org.lamsfoundation.lams.tool.videoRecorder.service.VideoRecorderService;
 import org.lamsfoundation.lams.tool.videoRecorder.service.VideoRecorderServiceProxy;
 import org.lamsfoundation.lams.tool.videoRecorder.util.VideoRecorderRecordingComparator;
 import org.lamsfoundation.lams.tool.videoRecorder.dto.VideoRecorderCommentDTO;
@@ -60,6 +64,8 @@
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.Configuration;
 import org.lamsfoundation.lams.util.ConfigurationKeys;
+import org.lamsfoundation.lams.util.ExternalServerUtil;
+import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.session.SessionManager;
@@ -88,6 +94,7 @@
 
     //---------------------------------------------------------------------
 	private static final String TOOL_SESSION_ID = "toolSessionId";
+	private static final String TOOL_CONTENT_ID = "toolContentId";
 	private static final String USER_ID = "userId";
 	private static final String TITLE = "title";
 	private static final String DESCRIPTION = "description";
@@ -104,7 +111,12 @@
 	private static final String GET_ALL = "getAll";
 	private static final String OK_MSG = "ok";
 	private static final String ERROR_MSG = "error";
-		
+	private static final String SAVE_TO_LAMS = "saveToLams";
+	private static final String SAVE_TO_LAMS_DEST = "saveToLamsDest";
+	
+	private String VIDEORECORDER_RECORDINGS_FOLDER_DEST = "";
+	private static final String VIDEORECORDER_RECORDINGS_FOLDER_SRC = Configuration.get(ConfigurationKeys.RED5_RECORDINGS_URL);
+	
 	private Integer getUserId(HttpServletRequest request) {
 		HttpSession ss = SessionManager.getSession();
 		UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
@@ -124,6 +136,7 @@
 
 		// get paramaters from POST
     	Long toolSessionId = WebUtil.readLongParam(request, TOOL_SESSION_ID);
+    	Long toolContentId = WebUtil.readLongParam(request, TOOL_CONTENT_ID);
     	Long userId = WebUtil.readLongParam(request, USER_ID);
     	String sortBy = WebUtil.readStrParam(request, SORT_BY);
     	String sortDirection = WebUtil.readStrParam(request, SORT_DIR);
@@ -138,17 +151,17 @@
 		// if no user is specified
 		if(getAll){
 			// get all recordings
-			videoRecorderRecordingDTOs = videoRecorderService.getRecordingsByToolSessionId(toolSessionId);
+			videoRecorderRecordingDTOs = videoRecorderService.getRecordingsByToolSessionId(toolSessionId, toolContentId);
 		// otherwise
 		} else{
 			// get all recordings from user specified
-			videoRecorderRecordingDTOs = videoRecorderService.getRecordingsByToolSessionIdAndUserId(toolSessionId, userId);
+			videoRecorderRecordingDTOs = videoRecorderService.getRecordingsByToolSessionIdAndUserId(toolSessionId, userId, toolContentId);
 		}
 		
 		// sort the list of recording DTOs in order to create the xml correctly
 		Comparator<VideoRecorderRecordingDTO> comp = new VideoRecorderRecordingComparator(sortBy, sortDirection);
 	    Collections.sort(videoRecorderRecordingDTOs, comp);
-
+	    
 		String xmlOutput = buildVideoRecordingsXML(videoRecorderRecordingDTOs, userId);
 		writeAJAXResponse(response, xmlOutput);
 		return null;
@@ -160,51 +173,98 @@
 
 		try{
 			// get paramaters from POST
-			Long toolSessionId = WebUtil.readLongParam(request, TOOL_SESSION_ID);
-	    	Long recordingId = WebUtil.readLongParam(request, RECORDING_ID);
-	    	Long userId = WebUtil.readLongParam(request, USER_ID);
-	    	String title = WebUtil.readStrParam(request, TITLE);
-	    	String description = WebUtil.readStrParam(request, DESCRIPTION);
-	    	String filename = WebUtil.readStrParam(request, FILENAME);
-	    	Boolean isJustSound = WebUtil.readBooleanParam(request, IS_JUST_SOUND);
-	    	int rating = WebUtil.readIntParam(request, RATING);
+			Long toolSessionId = WebUtil.readLongParam(request, TOOL_SESSION_ID, true);
+			Long toolContentId = WebUtil.readLongParam(request, TOOL_CONTENT_ID, true);
+	    	Long recordingId = WebUtil.readLongParam(request, RECORDING_ID, true);
+	    	Long userId = WebUtil.readLongParam(request, USER_ID, true);
+	    	String title = WebUtil.readStrParam(request, TITLE, false);
+	    	String description = WebUtil.readStrParam(request, DESCRIPTION, false);
+	    	String filename = WebUtil.readStrParam(request, FILENAME, true);
+	    	Boolean isJustSound = WebUtil.readBooleanParam(request, IS_JUST_SOUND, false);
+	    	int rating = WebUtil.readIntParam(request, RATING, false);
+	    	Boolean saveToLams = WebUtil.readBooleanParam(request, SAVE_TO_LAMS, false);
 	    	
 	    	// get service
 			IVideoRecorderService videoRecorderService = VideoRecorderServiceProxy.getVideoRecorderService(getServlet().getServletContext());
 			
-			// get user
-			VideoRecorderUser user = videoRecorderService.getUserByUID(userId);
+			// initialize session, user and recording
+			VideoRecorderSession session = null;
+			VideoRecorderUser user = null;
+			VideoRecorderRecording videoRecording = null;
+			VideoRecorder videoRecorder = null;
 			
-			// get session
-			VideoRecorderSession session = videoRecorderService.getSessionBySessionId(toolSessionId);
-			
-			
-			// create videoRecording
-			VideoRecorderRecording videoRecording;
-			
-			// if no recordingId is sent, create a new recording
-			if(recordingId == -1){
-				videoRecording = new VideoRecorderRecording();
-				videoRecording.setCreateBy(user);
-				videoRecording.setVideoRecorderSession(session);
-				videoRecording.setFilename(filename);
-				videoRecording.setRating((float)rating);
-				videoRecording.setCreateDate(new Date());
-				videoRecording.setIsJustSound(isJustSound);
-				videoRecording.setRatings(null);
-				videoRecording.setComments(null);
+			// if saving from author
+			if(toolContentId != -1){
+				// get video recorder
+				videoRecorder = videoRecorderService.getVideoRecorderByContentId(toolContentId);
+				
+				if(videoRecorder != null){
+					// get recording
+					videoRecording = videoRecorderService.getFirstRecordingByToolContentId(toolContentId);
+					
+					// if no recording exists create a new one
+					if(videoRecording == null){
+						videoRecording = new VideoRecorderRecording();
+						
+						videoRecording.setFilename(filename);
+						videoRecording.setRating((float)rating);
+						videoRecording.setCreateDate(new Date());
+						videoRecording.setIsJustSound(isJustSound);
+						videoRecording.setRatings(null);
+						videoRecording.setComments(null);
+						videoRecording.setCreateBy(null);
+						videoRecording.setToolContentId(toolContentId);
+					}					
+				}
+				
 			}
-			// otherwise get the recording from the DAO
-			else{
-				videoRecording = videoRecorderService.getRecordingById(recordingId);
-			}
+			// if saving from learner
+			else if(toolSessionId != -1){
+				// get session
+				session = videoRecorderService.getSessionBySessionId(toolSessionId);
+				
+				// get user
+				user = videoRecorderService.getUserByUID(userId);
+				
+				// if no recording id is specified
+				if(recordingId == -1){
+					// create a new recording
+					videoRecording = new VideoRecorderRecording();
+					videoRecording.setFilename(filename);
+					videoRecording.setRating((float)rating);
+					videoRecording.setCreateDate(new Date());
+					videoRecording.setIsJustSound(isJustSound);
+					videoRecording.setRatings(null);
+					videoRecording.setComments(null);
+					videoRecording.setCreateBy(user);
+					videoRecording.setVideoRecorderSession(session);
+				}
+				// otherwise get the recording from the DAO
+				else{
+					videoRecording = videoRecorderService.getRecordingById(recordingId);
+				}
+			}	
 			
+			// add the last common information
 			videoRecording.setUpdateDate(new Date());
 			videoRecording.setTitle(title);
 			videoRecording.setDescription(description);
+			videoRecording.setFilename(filename);
 			
+			// save
 			videoRecorderService.saveOrUpdateVideoRecorderRecording(videoRecording);
 			
+			// if we want the recently
+			if(saveToLams){
+				// get folder dest
+				VIDEORECORDER_RECORDINGS_FOLDER_DEST = WebUtil.readStrParam(request, SAVE_TO_LAMS_DEST);
+				// get the stream from the external server
+			    InputStream is = ExternalServerUtil.getResponseInputStreamFromExternalServer(VIDEORECORDER_RECORDINGS_FOLDER_SRC + filename, new HashMap<String, String>());
+			    
+			    // write the flv file locally
+			    File file = ExternalServerUtil.writeFile(is, VIDEORECORDER_RECORDINGS_FOLDER_DEST + filename);
+			}
+			
 			writeAJAXResponse(response, OK_MSG);
 			
 		}catch(Exception e){
@@ -369,95 +429,43 @@
 		return null;
 	}
 	
-	/*
-	public ActionForward savePreviewImage(ActionMapping mapping,
+	public ActionForward getLanguageXML(ActionMapping mapping,
 			ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) throws IOException, ServletException {
+		// get service
+		try{
+			IVideoRecorderService videoRecorderService = VideoRecorderServiceProxy.getVideoRecorderService(getServlet().getServletContext());
+			writeAJAXResponse(response, videoRecorderService.getLanguageXML());
+		}catch(Exception e){
+			writeAJAXResponse(response, ERROR_MSG + e.getMessage());
+		}
 		
-    	// Use functionality in org.red5.io.amf3.ByteArray to get parameters of the ByteArray
-		String rawImageString = request.getParameter(RAW_IMAGE);
-    	ByteArray rawImage;
-    	int BCurrentlyAvailable = rawImage.bytesAvailable();
-    	int BWholeSize = rawImage.length(); // Put the Red5 ByteArray into a standard Java array of bytes
-    	byte c[] = new byte[BWholeSize];
-    	rawImage.readBytes(c);
+		return null;
 
-    	// Transform the byte array into a java buffered image
-    	ByteArrayInputStream db = new ByteArrayInputStream(c);
-
-    	if(BCurrentlyAvailable > 0) {
-    		System.out.println("The byte Array currently has " + BCurrentlyAvailable + " bytes. The Buffer has " + db.available());
-    		try{
-    			BufferedImage JavaImage = ImageIO.read(db);
-    			// Now lets try and write the buffered image out to a file
-    			if(JavaImage != null) { // If you sent a jpeg to the server, just change PNG to JPEG and Red5ScreenShot.png to .jpeg
-    				ImageIO.write(JavaImage, "PNG", new File("Red5ScreenShot.png"));
-    			}
-    		}
-    		catch(IOException e){
-    			System.out.println("Save_ScreenShot: Writing of screenshot failed " + e); System.out.println("IO Error " + e);
-    		}
-    	}
-    	
-    	return null;
-    }
-    */
+	}
 	
-	/* for hierarchal data
-	private String buildVideoRecordingsXML(List<VideoRecorderRecordingDTO> videoRecorderRecordingDTOs, Long userId){
-		//start the output
-		String xmlOutput = "<xml><recordings>";
-		Long lastUserId = Long.valueOf("-1");
-		Long currentUserId = Long.valueOf("-1");
-		
-		// for every user, print out its recordings
-		for(VideoRecorderRecordingDTO videoRecorderRecordingDTO: videoRecorderRecordingDTOs){
-			VideoRecorderUser user = videoRecorderRecordingDTO.getCreateBy();
-			Set<VideoRecorderCommentDTO> comments = videoRecorderRecordingDTO.getComments();
-			Set<VideoRecorderRatingDTO> ratings = videoRecorderRecordingDTO.getRatings();
-			
-			currentUserId = user.getUserId();
-			if(currentUserId != lastUserId){
-				if(lastUserId != -1){
-					xmlOutput += "</userFolder>";
-				}
-				xmlOutput += "<userFolder>";
-				xmlOutput += "<title>" + user.getFirstName() + " " + user.getLastName() + "</title>";
-			}
-			
-			xmlOutput += "<child><recording>";
-			xmlOutput += "<recordingId>" + videoRecorderRecordingDTO.getUid() + "</recordingId>";
-			xmlOutput += "<title>" + videoRecorderRecordingDTO.getTitle() + "</title>";
-			xmlOutput += "<userUid>" + user.getUid() + "</userUid>";
-			xmlOutput += "<userId>" + user.getUserId() + "</userId>";
-			xmlOutput += "<author>" + user.getFirstName() + " " + user.getLoginName() + "</author>";
-			xmlOutput += "<createDate>" + videoRecorderRecordingDTO.getCreateDate().toLocaleString() + "</createDate>";
-			xmlOutput += "<updateDate>" + videoRecorderRecordingDTO.getUpdateDate().toLocaleString() + "</updateDate>";
-			xmlOutput += "<description>" + videoRecorderRecordingDTO.getDescription() + "</description>";
-			xmlOutput += "<filename>" + videoRecorderRecordingDTO.getFilename() + "</filename>";
-			xmlOutput += "<rating>" + videoRecorderRecordingDTO.getRating() + "</rating>";
-			xmlOutput += "<userRating>" + buildUserRating(ratings, userId) + "</userRating>";
-			
-			// for every recording, print out its comments
-			xmlOutput += buildVideoCommentsXML(comments);
-			xmlOutput += "</recording></child>";
-			
-			lastUserId = currentUserId;
+	public ActionForward getLanguageXMLForFCK(ActionMapping mapping,
+			ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) throws IOException, ServletException {
+		// get service
+		try{
+			IVideoRecorderService videoRecorderService = VideoRecorderServiceProxy.getVideoRecorderService(getServlet().getServletContext());
+			writeAJAXResponse(response, videoRecorderService.getLanguageXMLForFCK());
+		}catch(Exception e){
+			writeAJAXResponse(response, "");
 		}
 		
-		if(lastUserId == currentUserId && (lastUserId != -1 || currentUserId != -1)){
-			xmlOutput += "</userFolder>";
-		}
-		
-		xmlOutput += "</recordings></xml>";
-		return xmlOutput;
+		return null;
+
 	}
-	*/
 	
 	private String buildVideoRecordingsXML(List<VideoRecorderRecordingDTO> videoRecorderRecordingDTOs, Long userId){
 		//start the output
 		String xmlOutput = "<recordings>";
 		
+		// get service
+		IVideoRecorderService videoRecorderService = VideoRecorderServiceProxy.getVideoRecorderService(getServlet().getServletContext());
+		
 		// for all recordings, print out their information
 		for(VideoRecorderRecordingDTO videoRecorderRecordingDTO: videoRecorderRecordingDTOs){
 			VideoRecorderUser user = videoRecorderRecordingDTO.getCreateBy();
@@ -467,9 +475,18 @@
 			xmlOutput += "<recording>";
 			xmlOutput += "<recordingId>" + videoRecorderRecordingDTO.getUid() + "</recordingId>";
 			xmlOutput += "<title>" + videoRecorderRecordingDTO.getTitle() + "</title>";
-			xmlOutput += "<userUid>" + user.getUid() + "</userUid>";
-			xmlOutput += "<userId>" + user.getUserId() + "</userId>";
-			xmlOutput += "<author>" + user.getFirstName() + " " + user.getLoginName() + "</author>";
+			
+			if(user != null){
+				xmlOutput += "<isToolContent>false</isToolContent>";
+				xmlOutput += "<userUid>" + user.getUid() + "</userUid>";
+				xmlOutput += "<userId>" + user.getUserId() + "</userId>";
+				xmlOutput += "<author>" + user.getFirstName() + " " + user.getLoginName() + "</author>";
+			}
+			else if(user == null && videoRecorderRecordingDTO.getToolContentId() != -1){
+				xmlOutput += "<isToolContent>true</isToolContent>";
+				xmlOutput += "<author>" + videoRecorderService.getMessage("videorecorder.instructor") + "</author>";
+			}
+
 			xmlOutput += "<createDate>" + videoRecorderRecordingDTO.getCreateDate().toLocaleString() + "</createDate>";
 			xmlOutput += "<updateDate>" + videoRecorderRecordingDTO.getUpdateDate().toLocaleString() + "</updateDate>";
 			xmlOutput += "<description>" + videoRecorderRecordingDTO.getDescription() + "</description>";
Index: lams_tool_videorecorder/web/includes/flash/VideoRecorder.html
===================================================================
diff -u -r049932651d9d1c08ed1681df0a044d7f519a4215 -r42aa5319fbd33938828764c43dd0ab1ca80e2416
--- lams_tool_videorecorder/web/includes/flash/VideoRecorder.html	(.../VideoRecorder.html)	(revision 049932651d9d1c08ed1681df0a044d7f519a4215)
+++ lams_tool_videorecorder/web/includes/flash/VideoRecorder.html	(.../VideoRecorder.html)	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
@@ -63,8 +63,8 @@
 	AC_FL_RunContent(
 		"src", "playerProductInstall",
 		"FlashVars", "MMredirectURL="+MMredirectURL+'&MMplayerType='+MMPlayerType+'&MMdoctitle='+MMdoctitle+"",
-		"width", "682",
-		"height", "652",
+		"width", "100%",
+		"height", "100%",
 		"align", "middle",
 		"id", "VideoRecorder",
 		"quality", "high",
@@ -79,8 +79,8 @@
 	// embed the Flash Content SWF when all tests are passed
 	AC_FL_RunContent(
 			"src", "VideoRecorder",
-			"width", "682",
-			"height", "652",
+			"width", "100%",
+			"height", "100%",
 			"align", "middle",
 			"id", "VideoRecorder",
 			"quality", "high",
@@ -100,14 +100,14 @@
 </script>
 <noscript>
   	<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
-			id="VideoRecorder" width="682" height="652"
+			id="VideoRecorder" width="100%" height="100%"
 			codebase="http://fpdownload.macromedia.com/get/flashplayer/current/swflash.cab">
 			<param name="movie" value="VideoRecorder.swf" />
 			<param name="quality" value="high" />
 			<param name="bgcolor" value="#869ca7" />
 			<param name="allowScriptAccess" value="sameDomain" />
 			<embed src="VideoRecorder.swf" quality="high" bgcolor="#869ca7"
-				width="682" height="652" name="VideoRecorder" align="middle"
+				width="100%" height="100%" name="VideoRecorder" align="middle"
 				play="true"
 				loop="false"
 				quality="high"
Index: lams_tool_videorecorder/web/includes/flash/VideoRecorder.swf
===================================================================
diff -u -r049932651d9d1c08ed1681df0a044d7f519a4215 -r42aa5319fbd33938828764c43dd0ab1ca80e2416
Binary files differ
Index: lams_tool_videorecorder/web/includes/flash/VideoRecorderFCKEditor.swf
===================================================================
diff -u -r049932651d9d1c08ed1681df0a044d7f519a4215 -r42aa5319fbd33938828764c43dd0ab1ca80e2416
Binary files differ
Index: lams_tool_videorecorder/web/includes/flash/assets/images/playerVolume.png
===================================================================
diff -u
Binary files differ
Index: lams_tool_videorecorder/web/pages/authoring/advanced.jsp
===================================================================
diff -u -r049932651d9d1c08ed1681df0a044d7f519a4215 -r42aa5319fbd33938828764c43dd0ab1ca80e2416
--- lams_tool_videorecorder/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision 049932651d9d1c08ed1681df0a044d7f519a4215)
+++ lams_tool_videorecorder/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
@@ -35,14 +35,6 @@
 </p>
 
 <p>
-	<html:checkbox property="allowLearnerVideoExport" value="1"
-		styleClass="noBorder" styleId="allowLearnerVideoExport"></html:checkbox>
-	<label for="allowLearnerVideoExport">
-		<fmt:message key="advanced.allowLearnerVideoExport" />
-	</label>
-</p>
-
-<p>
 	<html:checkbox property="allowComments" value="1"
 		styleClass="noBorder" styleId="allowComments"></html:checkbox>
 	<label for="allowComments">
@@ -56,4 +48,20 @@
 	<label for="allowRatings">
 		<fmt:message key="advanced.allowRatings" />
 	</label>
+</p>
+
+<p>
+	<html:checkbox property="exportOffline" value="1"
+		styleClass="noBorder" styleId="exportOffline"></html:checkbox>
+	<label for="exportOffline">
+		<fmt:message key="advanced.exportOffline" />
+	</label>
+</p>
+
+<p>
+	<html:checkbox property="exportAll" value="1"
+		styleClass="noBorder" styleId="exportAll"></html:checkbox>
+	<label for="exportAll">
+		<fmt:message key="advanced.exportAll" />
+	</label>
 </p>
\ No newline at end of file
Index: lams_tool_videorecorder/web/pages/authoring/basic.jsp
===================================================================
diff -u -r049932651d9d1c08ed1681df0a044d7f519a4215 -r42aa5319fbd33938828764c43dd0ab1ca80e2416
--- lams_tool_videorecorder/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 049932651d9d1c08ed1681df0a044d7f519a4215)
+++ lams_tool_videorecorder/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
@@ -1,10 +1,29 @@
+<%@ page import="org.lamsfoundation.lams.util.Configuration" %>
+<%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
 <%@ include file="/common/taglibs.jsp"%>
 
 <c:set var="formBean"
 	value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 <c:set var="sessionMap" value="${sessionScope[formBean.sessionMapID]}" />
 <c:set var="sessionMapID" value="${formBean.sessionMapID}" />
+<c:set var="dto" value="${videoRecorderDTO}" />
 
+<script src="./includes/flash/AC_OETags.js" language="javascript"></script>
+<script language="JavaScript" type="text/javascript">
+<!--
+// -----------------------------------------------------------------------------
+// Globals
+// Major version of Flash required
+var requiredMajorVersion = 9;
+// Minor version of Flash required
+var requiredMinorVersion = 0;
+// Minor version of Flash required
+var requiredRevision = 124;
+
+// -----------------------------------------------------------------------------
+</script>
+
 <!-- ========== Basic Tab ========== -->
 <table cellpadding="0">
 	<tr>
@@ -25,52 +44,87 @@
 				contentFolderID="${sessionMap.contentFolderID}"></lams:FCKEditor>
 		</td>
 	</tr>
-	<tr>
-		<td class="field-name">
-			<fmt:message key="advanced.allowUseVoice" />
-		</td>
+	<tr align="center">
 		<td>
-			<html:checkbox property="allowUseVoice" styleClass="noBorder"></html:checkbox>
+			<script language="JavaScript" type="text/javascript">
+			<!--
+			// Version check for the Flash Player that has the ability to start Player Product Install (6.0r65)
+			var hasProductInstall = DetectFlashVer(6, 0, 65);
+			
+			// Version check based upon the values defined in globals
+			var hasRequestedVersion = DetectFlashVer(requiredMajorVersion, requiredMinorVersion, requiredRevision);
+			
+			if ( hasProductInstall && !hasRequestedVersion ) {
+				// DO NOT MODIFY THE FOLLOWING FOUR LINES
+				// Location visited after installation is complete if installation is required
+				var MMPlayerType = (isIE == true) ? "ActiveX" : "PlugIn";
+				var MMredirectURL = window.location;
+			    document.title = document.title.slice(0, 47) + " - Flash Player Installation";
+			    var MMdoctitle = document.title;
+			
+				AC_FL_RunContent(
+					"src", "./includes/flash/playerProductInstall",
+					"FlashVars", "MMredirectURL="+MMredirectURL+'&MMplayerType='+MMPlayerType+'&MMdoctitle='+MMdoctitle+"",
+					"width", "361",
+					"height", "331",
+					"align", "middle",
+					"id", "VideoRecorderFCKEditor",
+					"quality", "high",
+					"bgcolor", "#ffffff",
+					"name", "VideoRecorderFCKEditor",
+					"allowScriptAccess","always",
+					"type", "application/x-shockwave-flash",
+					"pluginspage", "http://www.adobe.com/go/getflashplayer"
+				);
+			} else if (hasRequestedVersion) {
+				// if we've detected an acceptable version
+				// embed the Flash Content SWF when all tests are passed
+				AC_FL_RunContent(
+						"src", "./includes/flash/VideoRecorderFCKEditor",
+						"FlashVars", "mode=recorderModeAuthor"+'&red5ServerUrl=<%= Configuration.get(ConfigurationKeys.RED5_SERVER_URL) %>'+'&serverUrl=<%= Configuration.get(ConfigurationKeys.SERVER_URL) %>'+'&filename='+'${videoRecorderRecordingDTO.filename}'+'&toolContentId='+${toolContentId}+'&languageXML='+"${languageXML}"+"",
+						"width", "361",
+						"height", "331",
+						"align", "middle",
+						"id", "VideoRecorderFCKEditor",
+						"quality", "high",
+						"bgcolor", "#ffffff",
+						"name", "VideoRecorderFCKEditor",
+						"allowScriptAccess","always",
+						"type", "application/x-shockwave-flash",
+						"pluginspage", "http://www.adobe.com/go/getflashplayer"
+				);
+			  } else {  // flash is too old or we can't detect the plugin
+			    var alternateContent = 'Alternate HTML content should be placed here. '
+			  	+ 'This content requires the Adobe Flash Player. '
+			   	+ '<a href=http://www.adobe.com/go/getflash/>Get Flash</a>';
+			    document.write(alternateContent);  // insert non-flash content
+			  }
+			// -->
+			</script>
+			<noscript>
+			  	<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
+						id="VideoRecorderFCKEditor" width="361" height="331"
+						codebase="http://fpdownload.macromedia.com/get/flashplayer/current/swflash.cab">
+						<param name="movie" value="VideoRecorderFCKEditor.swf" />
+						<param name="quality" value="high" />
+						<param name="bgcolor" value="#ffffff" />
+						<param name="allowScriptAccess" value="sameDomain" />
+						<embed src="./includes/flash/VideoRecorderFCKEditor.swf" quality="high" bgcolor="#869ca7"
+							width="361" height="331" name="VideoRecorderFCKEditor" align="middle"
+							play="true"
+							loop="false"
+							quality="high"
+							allowScriptAccess="always"
+							type="application/x-shockwave-flash"
+							pluginspage="http://www.adobe.com/go/getflashplayer">
+						</embed>
+				</object>
+			</noscript>
 		</td>
 	</tr>
 	<tr>
-		<td class="field-name">
-			<fmt:message key="advanced.allowUseCamera" />
-		</td>
 		<td>
-			<html:checkbox property="allowUseCamera" styleClass="noBorder"></html:checkbox>
+			<fmt:message key="videorecorder.instructions.author"></fmt:message>
 		</td>
 	</tr>
-	<tr>
-		<td class="field-name">
-			<fmt:message key="advanced.allowLearnerVideoVisibility" />
-		</td>
-		<td>
-			<html:checkbox property="allowLearnerVideoVisibility" styleClass="noBorder"></html:checkbox>
-		</td>
-	</tr>
-	<tr>
-		<td class="field-name">
-			<fmt:message key="advanced.allowLearnerVideoExport" />
-		</td>
-		<td>
-			<html:checkbox property="allowLearnerVideoExport" styleClass="noBorder"></html:checkbox>
-		</td>
-	</tr>
-	<tr>
-		<td class="field-name">
-			<fmt:message key="advanced.allowComments" />
-		</td>
-		<td>
-			<html:checkbox property="allowComments" styleClass="noBorder"></html:checkbox>
-		</td>
-	</tr>
-	<tr>
-		<td class="field-name">
-			<fmt:message key="advanced.allowRatings" />
-		</td>
-		<td>
-			<html:checkbox property="allowRatings" styleClass="noBorder"></html:checkbox>
-		</td>
-	</tr>
 </table>
Index: lams_tool_videorecorder/web/pages/export/exportPortfolio.jsp
===================================================================
diff -u -r049932651d9d1c08ed1681df0a044d7f519a4215 -r42aa5319fbd33938828764c43dd0ab1ca80e2416
--- lams_tool_videorecorder/web/pages/export/exportPortfolio.jsp	(.../exportPortfolio.jsp)	(revision 049932651d9d1c08ed1681df0a044d7f519a4215)
+++ lams_tool_videorecorder/web/pages/export/exportPortfolio.jsp	(.../exportPortfolio.jsp)	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
@@ -100,7 +100,7 @@
 											"quality", "high",
 											"bgcolor", "#869ca7",
 											"name", "VideoRecorderFCKEditor",
-											"allowScriptAccess","sameDomain",
+											"allowScriptAccess","always",
 											"type", "application/x-shockwave-flash",
 											"pluginspage", "http://www.adobe.com/go/getflashplayer"
 										);
@@ -109,15 +109,22 @@
 										// embed the Flash Content SWF when all tests are passed
 										AC_FL_RunContent(
 												"src", "./files/VideoRecorderFCKEditor",
-												"FlashVars", "&mode="+'playerModeOffline'+'&red5ServerUrl='+'${red5ServerUrl}'+'&serverUrl='+'${serverUrl}'+'&filename='+'${recording.filename}'+'&languageXML='+"${languageXML}"+"",
+												<c:choose>
+												<c:when test="${videoRecorderDTO.exportOffline == true}">
+													"FlashVars", "&mode="+'playerModeOffline'+'&red5ServerUrl='+'${red5ServerUrl}'+'&serverUrl='+'${serverUrl}'+'&filename='+'${recording.filename}'+'&languageXML='+"${languageXML}"+"",
+												</c:when>
+												<c:otherwise>
+													"FlashVars", "&mode="+'playerModeOnline'+'&red5ServerUrl='+'${red5ServerUrl}'+'&serverUrl='+'${serverUrl}'+'&filename='+'${recording.filename}'+'&languageXML='+"${languageXML}"+"",
+												</c:otherwise>
+												</c:choose>											
 												"width", "361",
 												"height", "331",
 												"align", "middle",
 												"id", "VideoRecorderFCKEditor",
 												"quality", "high",
 												"bgcolor", "#869ca7",
 												"name", "VideoRecorderFCKEditor",
-												"allowScriptAccess","sameDomain",
+												"allowScriptAccess","always",
 												"type", "application/x-shockwave-flash",
 												"pluginspage", "http://www.adobe.com/go/getflashplayer"
 										);
Index: lams_tool_videorecorder/web/pages/learning/videoRecorder.jsp
===================================================================
diff -u -r049932651d9d1c08ed1681df0a044d7f519a4215 -r42aa5319fbd33938828764c43dd0ab1ca80e2416
--- lams_tool_videorecorder/web/pages/learning/videoRecorder.jsp	(.../videoRecorder.jsp)	(revision 049932651d9d1c08ed1681df0a044d7f519a4215)
+++ lams_tool_videorecorder/web/pages/learning/videoRecorder.jsp	(.../videoRecorder.jsp)	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
@@ -101,14 +101,14 @@
 			AC_FL_RunContent(
 				"src", "./includes/flash/playerProductInstall",
 				"FlashVars", "MMredirectURL="+MMredirectURL+'&MMplayerType='+MMPlayerType+'&MMdoctitle='+MMdoctitle+"",
-				"width", "680",
+				"width", "100%",
 				"height", "676",
 				"align", "middle",
 				"id", "VideoRecorder",
 				"quality", "high",
 				"bgcolor", "#ffffff",
 				"name", "VideoRecorder",
-				"allowScriptAccess","sameDomain",
+				"allowScriptAccess","always",
 				"type", "application/x-shockwave-flash",
 				"pluginspage", "http://www.adobe.com/go/getflashplayer"
 			);
@@ -117,15 +117,15 @@
 			// embed the Flash Content SWF when all tests are passed
 			AC_FL_RunContent(
 					"src", "./includes/flash/VideoRecorder",
-					"FlashVars", "contentEditable"+${contentEditable}+'&toolSessionId='+${toolSessionId}+'&mode='+'${mode}'+'&userId='+${userId}+'&allowUseVoice='+${videoRecorderDTO.allowUseVoice}+'&allowUseCamera='+${videoRecorderDTO.allowUseCamera}+'&allowLearnerVideoVisibility='+${videoRecorderDTO.allowLearnerVideoVisibility}+'&allowLearnerVideoExport='+${videoRecorderDTO.allowLearnerVideoExport}+'&allowComments='+${videoRecorderDTO.allowComments}+'&allowRatings='+${videoRecorderDTO.allowRatings}+'&red5ServerUrl='+'${red5ServerUrl}'+'&serverUrl='+'${serverUrl}'+'&languageXML='+"${languageXML}"+"",
-					"width", "680",
+					"FlashVars", "contentEditable"+${contentEditable}+'&toolSessionId='+${toolSessionId}+'&toolContentId='+${toolContentId}+'&mode='+'${mode}'+'&userId='+${userId}+'&allowUseVoice='+${videoRecorderDTO.allowUseVoice}+'&allowUseCamera='+${videoRecorderDTO.allowUseCamera}+'&allowLearnerVideoVisibility='+${videoRecorderDTO.allowLearnerVideoVisibility}+'&allowComments='+${videoRecorderDTO.allowComments}+'&allowRatings='+${videoRecorderDTO.allowRatings}+'&red5ServerUrl='+'${red5ServerUrl}'+'&serverUrl='+'${serverUrl}'+'&languageXML='+"${languageXML}"+"",
+					"width", "100%",
 					"height", "676",
 					"align", "middle",
 					"id", "VideoRecorder",
 					"quality", "high",
 					"bgcolor", "#ffffff",
 					"name", "VideoRecorder",
-					"allowScriptAccess","sameDomain",
+					"allowScriptAccess","always",
 					"type", "application/x-shockwave-flash",
 					"pluginspage", "http://www.adobe.com/go/getflashplayer"
 			);
@@ -139,7 +139,7 @@
 		</script>
 		<noscript>
 		  	<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
-					id="VideoRecorder" width="680" height="676"
+					id="VideoRecorder" width="100%" height="676"
 					codebase="http://fpdownload.macromedia.com/get/flashplayer/current/swflash.cab">
 					<param name="movie" value="/includes/flash/VideoRecorder.swf" />
 					<param name="quality" value="high" />
@@ -150,11 +150,32 @@
 						play="true"
 						loop="false"
 						quality="high"
-						allowScriptAccess="sameDomain"
+						allowScriptAccess="always"
 						type="application/x-shockwave-flash"
 						pluginspage="http://www.adobe.com/go/getflashplayer">
 					</embed>
 			</object>
 		</noscript>
 	</div>
+	
+	<html:form action="/learning" method="post" onsubmit="disableFinishButton();" styleId="learningForm">
+		<html:hidden property="dispatch" styleId = "dispatch" value="finishActivity" />
+		<html:hidden property="toolSessionID" styleId="toolSessionID"/>
+		<html:hidden property="mode" value="${mode}" />	
+		<div class="space-bottom-top align-right">
+			<c:choose>
+				<c:when test="${!videoRecorderUserDTO.finishedActivity}">
+					<html:submit styleClass="button" onclick="javascript:document.getElementById('dispatch').value = 'finishActivity';">
+						<fmt:message key="button.continue" />
+					</html:submit>
+				</c:when>
+					<c:otherwise>
+					<html:hidden property="dispatch" value="finishActivity" />
+					<html:submit styleClass="button" styleId="finishButton" onclick="javascript:document.getElementById('dispatch').value = 'finishActivity';">
+						<fmt:message key="button.finish" />
+					</html:submit>
+				</c:otherwise>
+			</c:choose>
+		</div>
+	</html:form>
 </div>
Index: lams_tool_videorecorder/web/pages/monitoring/editActivity.jsp
===================================================================
diff -u -r049932651d9d1c08ed1681df0a044d7f519a4215 -r42aa5319fbd33938828764c43dd0ab1ca80e2416
--- lams_tool_videorecorder/web/pages/monitoring/editActivity.jsp	(.../editActivity.jsp)	(revision 049932651d9d1c08ed1681df0a044d7f519a4215)
+++ lams_tool_videorecorder/web/pages/monitoring/editActivity.jsp	(.../editActivity.jsp)	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
@@ -26,54 +26,7 @@
 				<c:out value="${dto.instructions}" escapeXml="false" />
 			</td>
 		</tr>
-		<tr>
-			<td class="field-name" width="30%">
-				<fmt:message key="advanced.allowUseVoice" />
-			</td>
-			<td>
-				<c:out value="${dto.allowUseVoice}" escapeXml="false" />
-			</td>
-		</tr>
-		<tr>
-			<td class="field-name" width="30%">
-				<fmt:message key="advanced.allowUseCamera" />
-			</td>
-			<td>
-				<c:out value="${dto.allowUseCamera}" escapeXml="false" />
-			</td>
-		</tr>
-		<tr>
-			<td class="field-name" width="30%">
-				<fmt:message key="advanced.allowLearnerVideoVisibility" />
-			</td>
-			<td>
-				<c:out value="${dto.allowLearnerVideoVisibility}" escapeXml="false" />
-			</td>
-		</tr>
-		<tr>
-			<td class="field-name" width="30%">
-				<fmt:message key="advanced.allowLearnerVideoExport" />
-			</td>
-			<td>
-				<c:out value="${dto.allowLearnerVideoExport}" escapeXml="false" />
-			</td>
-		</tr>
-		<tr>
-			<td class="field-name" width="30%">
-				<fmt:message key="advanced.allowComments" />
-			</td>
-			<td>
-				<c:out value="${dto.allowComments}" escapeXml="false" />
-			</td>
-		</tr>
-		<tr>
-			<td class="field-name" width="30%">
-				<fmt:message key="advanced.allowRatings" />
-			</td>
-			<td>
-				<c:out value="${dto.allowRatings}" escapeXml="false" />
-			</td>
-		</tr>
+		
 	</tbody>
 </table>
 
Index: lams_tool_videorecorder/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r049932651d9d1c08ed1681df0a044d7f519a4215 -r42aa5319fbd33938828764c43dd0ab1ca80e2416
--- lams_tool_videorecorder/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 049932651d9d1c08ed1681df0a044d7f519a4215)
+++ lams_tool_videorecorder/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
@@ -94,15 +94,15 @@
 			</c:choose>	
 		</td>
 	</tr>
-
+	
 	<tr>
 		<td>
-			<fmt:message key="advanced.allowLearnerVideoExport" />
+			<fmt:message key="advanced.allowComments" />
 		</td>
 		
 		<td>
 			<c:choose>
-				<c:when test="${dto.allowLearnerVideoExport}">
+				<c:when test="${dto.allowComments}">
 					<fmt:message key="label.on" />
 				</c:when>
 				<c:otherwise>
@@ -114,12 +114,12 @@
 	
 	<tr>
 		<td>
-			<fmt:message key="advanced.allowComments" />
+			<fmt:message key="advanced.allowRatings" />
 		</td>
 		
 		<td>
 			<c:choose>
-				<c:when test="${dto.allowComments}">
+				<c:when test="${dto.allowRatings}">
 					<fmt:message key="label.on" />
 				</c:when>
 				<c:otherwise>
@@ -128,15 +128,15 @@
 			</c:choose>	
 		</td>
 	</tr>
-
+	
 	<tr>
 		<td>
-			<fmt:message key="advanced.allowRatings" />
+			<fmt:message key="advanced.exportOffline" />
 		</td>
 		
 		<td>
 			<c:choose>
-				<c:when test="${dto.allowRatings}">
+				<c:when test="${dto.exportOffline}">
 					<fmt:message key="label.on" />
 				</c:when>
 				<c:otherwise>
@@ -146,6 +146,23 @@
 		</td>
 	</tr>
 	
+	<tr>
+		<td>
+			<fmt:message key="advanced.exportAll" />
+		</td>
+		
+		<td>
+			<c:choose>
+				<c:when test="${dto.exportAll}">
+					<fmt:message key="label.on" />
+				</c:when>
+				<c:otherwise>
+					<fmt:message key="label.off" />
+				</c:otherwise>
+			</c:choose>	
+		</td>
+	</tr>
+	
 </table>
 </div>
 
@@ -177,14 +194,14 @@
 		AC_FL_RunContent(
 			"src", "./includes/flash/playerProductInstall",
 			"FlashVars", "MMredirectURL="+MMredirectURL+'&MMplayerType='+MMPlayerType+'&MMdoctitle='+MMdoctitle+"",
-			"width", "680",
+			"width", "100%",
 			"height", "676",
 			"align", "middle",
 			"id", "VideoRecorder",
 			"quality", "high",
 			"bgcolor", "#ffffff",
 			"name", "VideoRecorder",
-			"allowScriptAccess","sameDomain",
+			"allowScriptAccess","always",
 			"type", "application/x-shockwave-flash",
 			"pluginspage", "http://www.adobe.com/go/getflashplayer"
 		);
@@ -193,15 +210,15 @@
 		// embed the Flash Content SWF when all tests are passed
 		AC_FL_RunContent(
 				"src", "./includes/flash/VideoRecorder",
-				"FlashVars", "contentEditable"+${contentEditable}+'&toolSessionId='+${toolSessionId}+'&mode='+'${mode}'+'&userId='+${userId}+'&allowUseVoice='+${videoRecorderDTO.allowUseVoice}+'&allowUseCamera='+${videoRecorderDTO.allowUseCamera}+'&allowLearnerVideoVisibility='+${videoRecorderDTO.allowLearnerVideoVisibility}+'&allowLearnerVideoExport='+${videoRecorderDTO.allowLearnerVideoExport}+'&allowComments='+${videoRecorderDTO.allowComments}+'&allowRatings='+${videoRecorderDTO.allowRatings}+'&red5ServerUrl='+'${red5ServerUrl}'+'&serverUrl='+'${serverUrl}'+'&languageXML='+"${languageXML}"+"",
-				"width", "680",
+				"FlashVars", "contentEditable"+${contentEditable}+'&toolSessionId='+${toolSessionId}+'&toolContentId='+${toolContentId}+'&mode='+'${mode}'+'&userId='+${userId}+'&allowUseVoice='+${videoRecorderDTO.allowUseVoice}+'&allowUseCamera='+${videoRecorderDTO.allowUseCamera}+'&allowLearnerVideoVisibility='+${videoRecorderDTO.allowLearnerVideoVisibility}+'&allowComments='+${videoRecorderDTO.allowComments}+'&allowRatings='+${videoRecorderDTO.allowRatings}+'&red5ServerUrl='+'${red5ServerUrl}'+'&serverUrl='+'${serverUrl}'+'&languageXML='+"${languageXML}"+"",
+				"width", "100%",
 				"height", "676",
 				"align", "middle",
 				"id", "VideoRecorder",
 				"quality", "high",
 				"bgcolor", "#ffffff",
 				"name", "VideoRecorder",
-				"allowScriptAccess","sameDomain",
+				"allowScriptAccess","always",
 				"type", "application/x-shockwave-flash",
 				"pluginspage", "http://www.adobe.com/go/getflashplayer"
 		);
@@ -222,11 +239,11 @@
 				<param name="bgcolor" value="#ffffff" />
 				<param name="allowScriptAccess" value="sameDomain" />
 				<embed src="./includes/flash/VideoRecorder.swf" quality="high" bgcolor="#869ca7"
-					width="526" height="676" name="VideoRecorder" align="middle"
+					width="100%" height="676" name="VideoRecorder" align="middle"
 					play="true"
 					loop="false"
 					quality="high"
-					allowScriptAccess="sameDomain"
+					allowScriptAccess="always"
 					type="application/x-shockwave-flash"
 					pluginspage="http://www.adobe.com/go/getflashplayer">
 				</embed>