Index: lams_central/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -r662af4c9490c6c67127cda6c29d7d806a9e9eaca -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82
--- lams_central/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 662af4c9490c6c67127cda6c29d7d806a9e9eaca)
+++ lams_central/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
@@ -189,24 +189,12 @@
       />
     </action>
     <action
-      path="/gradebook/gradebook"
-      type="org.lamsfoundation.lams.gradebook.web.action.GradeBookAction"
-      name="gradeBookForm"
-      scope="request"
-      parameter="dispatch"
+      path="/PresenceChatLogger"
+      type="org.lamsfoundation.lams.webservice.PresenceChatLoggerAction"
+      parameter="method"
       unknown="false"
       validate="false"
     >
-      <forward
-        name="error"
-        path=".error"
-        redirect="false"
-      />
-      <forward
-        name="message"
-        path=".message"
-        redirect="false"
-      />
     </action>
     <action
       path="/password"
@@ -223,6 +211,14 @@
       />
     </action>
     <action
+      path="/Paint"
+      type="org.lamsfoundation.lams.webservice.PaintAction"
+      parameter="method"
+      unknown="false"
+      validate="false"
+    >
+    </action>
+    <action
       path="/saveportrait"
       type="org.lamsfoundation.lams.web.PortraitSaveAction"
       name="PortraitActionForm"
@@ -536,36 +532,6 @@
       />
     </action>
     <action
-      path="/gradebook/gradebookMonitoring"
-      type="org.lamsfoundation.lams.gradebook.web.action.GradeBookMonitoringAction"
-      name="monitoringForm"
-      scope="request"
-      parameter="dispatch"
-      unknown="false"
-      validate="false"
-    >
-      <forward
-        name="monitorgradebook"
-        path="/gradebook/gradeBookMonitor.jsp"
-        redirect="false"
-      />
-      <forward
-        name="monitorcoursegradebook"
-        path="/gradebook/gradeBookCourseMonitor.jsp"
-        redirect="false"
-      />
-      <forward
-        name="error"
-        path=".error"
-        redirect="false"
-      />
-      <forward
-        name="message"
-        path=".message"
-        redirect="false"
-      />
-    </action>
-    <action
       path="/authoring/author"
       type="org.lamsfoundation.lams.authoring.web.AuthoringAction"
       parameter="method"
Index: lams_central/web/WEB-INF/web.xml
===================================================================
diff -u -r662af4c9490c6c67127cda6c29d7d806a9e9eaca -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82
--- lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision 662af4c9490c6c67127cda6c29d7d806a9e9eaca)
+++ lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
@@ -6,6 +6,24 @@
   	<param-value>org.lamsfoundation.lams.central.ApplicationResources</param-value>
 </context-param>
 
+<!--
+	In LAMS 2.3 there was a change in this section in all tools and core parts (central, learning, monitoring etc.)
+	All LAMS web application now use shared application context. See refBeanContext.xml file in lams_common for its description.
+	This refBeanContext.xml contains definition of the shared context. It is located by this entry:
+	<context-param>
+   		<param-name>locatorFactorySelector</param-name>
+   		<param-value>classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml</param-value>
+	</context-param>
+	telling to look for refBeanContext.xml files in selected parts of the classpath.
+	Currently LAMS has only one refBeanContext.xml with one shared context definition.
+	Lams_central uses only beans from the shared context "context.central". That is why there is no value
+	in contextConfigLocation.
+	Even so, this parameter needs to be declared with empty value for locatorFactorySelector to work properly.
+	Also, if no local application context file is declare, there MUST be a file named "applicationContext.xml"
+	in web/WEB-INF containing empty bean list, otherwise there will be errors during start up.
+	If there are local (private for web application; see tools and admin for example) bean definitions,
+	path to application context XML file can still be added to contextConfigLocation.
+ -->
 <context-param> 
 	<param-name>contextConfigLocation</param-name>
 	<param-value></param-value>
@@ -607,6 +625,8 @@
             <url-pattern>/authoringConfirm.jsp</url-pattern>
             <url-pattern>/community.jsp</url-pattern>
             <url-pattern>/editprofile.jsp</url-pattern>
+            <url-pattern>/findUserLessons.jsp</url-pattern>
+            <url-pattern>/findUserLessonsAutocomplete.jsp</url-pattern>
             <url-pattern>/footer.jsp</url-pattern>
             <url-pattern>/group.jsp</url-pattern>
             <url-pattern>/groupContents.jsp</url-pattern>
@@ -632,6 +652,7 @@
     		<url-pattern>/fckeditor/*</url-pattern>
     		<url-pattern>/toolcontent/*</url-pattern>
     		<url-pattern>/development/*</url-pattern>
+    		<url-pattern>/pedagogical_planner/*</url-pattern>
     		<url-pattern>/JHB/*</url-pattern>
     	</web-resource-collection>
     	<auth-constraint>
Index: lams_central/web/fckeditor/editor/plugins/videorecorder/VideoRecorderFCKEditor.jsp
===================================================================
diff -u -r0bbad8932a51efb88ac79f78bf2c7d7396554fe9 -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82
--- lams_central/web/fckeditor/editor/plugins/videorecorder/VideoRecorderFCKEditor.jsp	(.../VideoRecorderFCKEditor.jsp)	(revision 0bbad8932a51efb88ac79f78bf2c7d7396554fe9)
+++ lams_central/web/fckeditor/editor/plugins/videorecorder/VideoRecorderFCKEditor.jsp	(.../VideoRecorderFCKEditor.jsp)	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
@@ -2,7 +2,13 @@
 <%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="tags-core" prefix="c"%>
 
+<%
+	String red5Url = Configuration.get(ConfigurationKeys.RED5_SERVER_URL);
+	String red5RecordingsUrl = Configuration.get(ConfigurationKeys.RED5_RECORDINGS_URL);
+%>
+
 <!-- saved from url=(0014)about:internet -->
 <lams:html>
 
@@ -31,24 +37,20 @@
 <style>
 body { margin: 0px; overflow:hidden }
 </style>
+
+</lams:head>
+
+<body scroll="no">
 <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;
@@ -65,6 +67,10 @@
 		eSelected = oEditor.FCKSelection.GetSelectedElement();
 }
 
+<c:if test='<%= red5Url.equals("")  || red5RecordingsUrl.equals("") %>'>
+		alert(FCKLang.videorecorder_error_noconfig);
+</c:if>
+
 function getLanguageXML(){
 	var languageCollection = new Array('videorecorder_video_player', 'videorecorder_video_recorder',
 		'videorecorder_web_application_not_available', 'videorecorder_net_connection_not_connected', 'videorecorder_buffering',
@@ -116,8 +122,7 @@
 	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 +=	'FlashVars="mode=playerModeOffline'+'&offlinePlayback=true'+'&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>';
@@ -165,7 +170,16 @@
 				// 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()) + "",
+						"FlashVars", "mode=recorderModeFCK" +
+										'&offlinePlayback=false' + 
+										'&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",
Index: lams_central/web/fckeditor/editor/plugins/videorecorder/VideoRecorderFCKEditor.swf
===================================================================
diff -u -r0bbad8932a51efb88ac79f78bf2c7d7396554fe9 -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82
Binary files differ
Index: lams_central/web/fckeditor/editor/plugins/videorecorder/lang/en.js
===================================================================
diff -u -r42aa5319fbd33938828764c43dd0ab1ca80e2416 -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82
--- lams_central/web/fckeditor/editor/plugins/videorecorder/lang/en.js	(.../en.js)	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
+++ lams_central/web/fckeditor/editor/plugins/videorecorder/lang/en.js	(.../en.js)	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
@@ -29,4 +29,5 @@
 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
+FCKLang.videorecorder_disabled = 'Disabled';
+FCKLang.videorecorder_error_noconfig  = 'LAMS does not have a media server configured. Please contact your system administrator.';
\ No newline at end of file
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/authoring/ar_JO_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/authoring/bg_BG_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/authoring/cy_GB_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/authoring/da_DK_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/authoring/de_DE_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/authoring/el_GR_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/authoring/en_AU_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/authoring/en_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/authoring/es_ES_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/authoring/fr_FR_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/authoring/hu_HU_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/authoring/it_IT_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/authoring/ja_JP_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/authoring/ko_KR_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/authoring/mi_NZ_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/authoring/ms_MY_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/authoring/nl_BE_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/authoring/no_NO_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/authoring/pl_PL_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/authoring/pt_BR_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/authoring/ru_RU_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/authoring/sv_SE_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/authoring/th_TH_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/authoring/tr_TR_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/authoring/vi_VN_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/authoring/zh_CN_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/authoring/zh_TW_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/configData.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/contributorData.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/defaultTheme.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/learner/ar_JO_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/learner/cy_GB_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/learner/da_DK_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/learner/de_DE_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/learner/el_GR_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/learner/en_AU_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/learner/en_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/learner/es_ES_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/learner/fr_FR_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/learner/hu_HU_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/learner/it_IT_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/learner/ja_JP_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/learner/ko_KR_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/learner/mi_NZ_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/learner/ms_MY_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/learner/nl_BE_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/learner/no_NO_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/learner/pl_PL_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/learner/pt_BR_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/learner/ru_RU_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/learner/sv_SE_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/learner/tr_TR_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/learner/vi_VN_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/learner/zh_CN_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/web/flashxml/learner/zh_TW_dictionary.xml
===================================================================
diff -u
--- lams_central/web/flashxml/learner/zh_TW_dictionary.xml	(revision 0)
+++ lams_central/web/flashxml/learner/zh_TW_dictionary.xml	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
@@ -0,0 +1 @@
+<wddxPacket version="1.0"><!-- CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Thu Feb 19 23:15:18 CST 2009 --><header/><data><struct><var name="messageKey"><string>getDictionary</string></var><var name="messageType"><number>3</number></var><var name="messageValue"><array length="33"><struct><var name="key"><string>sys_error_msg_start</string></var><var name="value"><string>系統發生錯誤</string></var><var name="description"><string>Common System error message starting line</string></var></struct><struct><var name="key"><string>sys_error_msg_finish</string></var><var name="value"><string>您需要重新啟動這個瀏覽器視窗才能繼續。您想要保存這個錯誤的資訊，來幫助解決問題嗎？</string></var><var name="description"><string>Common System error message finish paragraph</string></var></struct><struct><var name="key"><string>sp_view_tooltip</string></var><var name="value"><string>檢視所有筆記條目</string></var><var name="description"><string>tool tip message for view all button</string></var></struct><struct><var name="key"><string>sp_save_tooltip</string></var><var name="value"><string>儲存您的筆記條目</string></var><var name="description"><string>tool tip message for save button</string></var></struct><struct><var name="key"><string>hd_exit_lbl</string></var><var name="value"><string>離開</string></var><var name="description"><string>Label for Exit button</string></var></struct><struct><var name="key"><string>ln_export_btn</string></var><var name="value"><string>匯出</string></var><var name="description"><string>Label for Export button</string></var></struct><struct><var name="key"><string>hd_resume_lbl</string></var><var name="value"><string>重新開始</string></var><var name="description"><string>Label for Resume button</string></var></struct><struct><var name="key"><string>sys_error</string></var><var name="value"><string>系統錯誤</string></var><var name="description"><string>System Error alert window title</string></var></struct><struct><var name="key"><string>al_alert</string></var><var name="value"><string>警告</string></var><var name="description"><string>Generic title for Alert window</string></var></struct><struct><var name="key"><string>al_cancel</string></var><var name="value"><string>取消</string></var><var name="description"><string>Cancel on alert dialog</string></var></struct><struct><var name="key"><string>al_confirm</string></var><var name="value"><string>確認</string></var><var name="description"><string>To Confirm title for LFError</string></var></struct><struct><var name="key"><string>al_ok</string></var><var name="value"><string>好</string></var><var name="description"><string>OK on alert dialog</string></var></struct><struct><var name="key"><string>al_doubleclick_todoactivity</string></var><var name="value"><string>對不起，您尚未到達這個活動</string></var><var name="description"><string>alert message when user double click on the todo activity in the sequence in learner progress</string></var></struct><struct><var name="key"><string>sp_view_lbl</string></var><var name="value"><string>觀看全部</string></var><var name="description"><string>Label for View All button</string></var></struct><struct><var name="key"><string>sp_save_lbl</string></var><var name="value"><string>儲存</string></var><var name="description"><string>Label for Save button</string></var></struct><struct><var name="key"><string>sp_title_lbl</string></var><var name="value"><string>標題</string></var><var name="description"><string>Label for title field of scratchpad (notebook)</string></var></struct><struct><var name="key"><string>sp_panel_lbl</string></var><var name="value"><string>筆記本</string></var><var name="description"><string>Label for panel title of scratchpad (notebook)</string></var></struct><struct><var name="key"><string>al_send</string></var><var name="value"><string>送出</string></var><var name="description"><string>Send button label on the system error dialog</string></var></struct><struct><var name="key"><string>schedule_gate_tooltip</string></var><var name="value"><string>這個閘門將開啟於{0}. </string></var><var name="description"><string>Tooltip for schedule gate in learner progress bar</string></var></struct><struct><var name="key"><string>synchronise_gate_tooltip</string></var><var name="value"><string>這個閘門將被釋放一旦所有學習者到達這個點</string></var><var name="description"><string>Tooltip for synchronise gate in learner progress bar</string></var></struct><struct><var name="key"><string>pres_panel_lbl</string></var><var name="value"><string>呈現</string></var><var name="description"><string>Presence panel label</string></var></struct><struct><var name="key"><string>pres_colnamelearners_lbl</string></var><var name="value"><string>學習者</string></var><var name="description"><string>Presence datagrid learners column</string></var></struct><struct><var name="key"><string>pres_dataproviderloading_lbl</string></var><var name="value"><string>下載呈現...</string></var><var name="description"><string>Presence datagrid learning loading alert</string></var></struct><struct><var name="key"><string>al_validation_act_unreached</string></var><var name="value"><string>你無法開啟此活動因你還未達到</string></var><var name="description"><string>Alert message when clicking on an unreached activity in the progess bar.</string></var></struct><struct><var name="key"><string>hd_resume_tooltip</string></var><var name="value"><string>跳到你目前的活動</string></var><var name="description"><string>tool tip message for resume button</string></var></struct><struct><var name="key"><string>hd_exit_tooltip</string></var><var name="value"><string>離開學習者環境並關閉瀏覽視窗</string></var><var name="description"><string>tool tip message for exit button</string></var></struct><struct><var name="key"><string>ln_export_tooltip</string></var><var name="value"><string>輸出你的貢獻到此課程</string></var><var name="description"><string>tool tip message for export button</string></var></struct><struct><var name="key"><string>completed_act_tooltip</string></var><var name="value"><string>按兩下去看完成的活動</string></var><var name="description"><string>tool tip message for completed activity icon</string></var></struct><struct><var name="key"><string>current_act_tooltip</string></var><var name="value"><string>按兩下去參加目前的活動</string></var><var name="description"><string>tool tip message for current activity icon</string></var></struct><struct><var name="key"><string>al_timeout</string></var><var name="value"><string>警告！進行中的資料無法套用直到下再完成前，請按好去繼續下載</string></var><var name="description"><string>Alert message for timeout error when loading learning design.</string></var></struct><struct><var name="key"><string>permission_gate_tooltip</string></var><var name="value"><string>直到敎師釋放前，你無法移動此閘門</string></var><var name="description"><string>Tooltip for permission gate in learner progress bar</string></var></struct><struct><var name="key"><string>not_attempted_act_tooltip</string></var><var name="value"><string>你必須在此活動前完成所有活動，才可進行</string></var><var name="description"><string>Tooltip for not yet attempted activities in the learner progress bar</string></var></struct><struct><var name="key"><string>al_act_reached_max</string></var><var name="value"><string>選擇性活動的最大數已經達到</string></var><var name="description"><string>al_act_reached_max</string></var></struct></array></var></struct></data></wddxPacket>
\ No newline at end of file
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/monitoring/ar_JO_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/monitoring/cy_GB_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/monitoring/da_DK_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/monitoring/de_DE_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/monitoring/el_GR_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/monitoring/en_AU_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/monitoring/en_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/monitoring/es_ES_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/monitoring/fr_FR_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/monitoring/hu_HU_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/monitoring/it_IT_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/monitoring/ja_JP_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/monitoring/ko_KR_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/monitoring/mi_NZ_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/monitoring/ms_MY_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/monitoring/nl_BE_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/monitoring/no_NO_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/monitoring/pl_PL_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/monitoring/pt_BR_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/monitoring/ru_RU_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/monitoring/sv_SE_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/monitoring/tr_TR_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/monitoring/vi_VN_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/monitoring/zh_CN_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/web/flashxml/monitoring/zh_TW_dictionary.xml
===================================================================
diff -u
--- lams_central/web/flashxml/monitoring/zh_TW_dictionary.xml	(revision 0)
+++ lams_central/web/flashxml/monitoring/zh_TW_dictionary.xml	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
@@ -0,0 +1 @@
+<wddxPacket version="1.0"><!-- CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Thu Feb 19 23:13:08 CST 2009 --><header/><data><struct><var name="messageKey"><string>getDictionary</string></var><var name="messageType"><number>3</number></var><var name="messageValue"><array length="190"><struct><var name="key"><string>ls_seq_status_not_set</string></var><var name="value"><string>尚未設定</string></var><var name="description"><string>The value of the sequence's status is not set</string></var></struct><struct><var name="key"><string>branch_mapping_dlg_condition_col_lbl</string></var><var name="value"><string>狀態</string></var><var name="description"><string>Column heading for showing condition description of the mapping.</string></var></struct><struct><var name="key"><string>ls_seq_status_sched_gate</string></var><var name="value"><string>時程閘門</string></var><var name="description"><string>A type of Gate Activity where progress depends on time (start time and/or end time)</string></var></struct><struct><var name="key"><string>branch_mapping_dlg_conditions_dgd_lbl</string></var><var name="value"><string>映圖</string></var><var name="description"><string>Heading label for Mapping datagrid.</string></var></struct><struct><var name="key"><string>branch_mapping_dlg_branch_col_lbl</string></var><var name="value"><string>分支</string></var><var name="description"><string>Column heading for showing sequence name of the mapping.</string></var></struct><struct><var name="key"><string>branch_mapping_dlg_group_col_lbl</string></var><var name="value"><string>群組</string></var><var name="description"><string>Column heading for showing group name of the mapping.</string></var></struct><struct><var name="key"><string>ccm_monitor_view_group_mappings</string></var><var name="value"><string>檢視群組到分支</string></var><var name="description"><string>Label for Custom Context View Group Mappings</string></var></struct><struct><var name="key"><string>ccm_monitor_view_condition_mappings</string></var><var name="value"><string>檢視</string></var><var name="description"><string>Label for Custom Context View Condition Mappings</string></var></struct><struct><var name="key"><string>mnu_go_sequence</string></var><var name="value"><string>編程</string></var><var name="description"><string>Menu bar Go to Sequence Tab</string></var></struct><struct><var name="key"><string>view_competences_in_ld_lbl</string></var><var name="value"><string>設計中的能力</string></var><var name="description"><string>Label for dialog that shows all the competences in a learning design with a name specified by the argument</string></var></struct><struct><var name="key"><string>mtab_lesson</string></var><var name="value"><string>課程</string></var><var name="description"><string>Monitor Lesson details tab</string></var></struct><struct><var name="key"><string>mtab_seq</string></var><var name="value"><string>順序</string></var><var name="description"><string>Monitor Sequence tab</string></var></struct><struct><var name="key"><string>ls_status_lbl</string></var><var name="value"><string>狀態</string></var><var name="description"><string>Status label - Lesson details</string></var></struct><struct><var name="key"><string>sys_error</string></var><var name="value"><string>系統錯誤</string></var><var name="description"><string>System Error elert window title</string></var></struct><struct><var name="key"><string>mnu_file_schedule</string></var><var name="value"><string>時程表</string></var><var name="description"><string>Menu bar Schedule</string></var></struct><struct><var name="key"><string>mnu_file_exit</string></var><var name="value"><string>離開</string></var><var name="description"><string>Menu bar Exit</string></var></struct><struct><var name="key"><string>mnu_go_lesson</string></var><var name="value"><string>課程</string></var><var name="description"><string>Menu bar  Go to Lesson Tab</string></var></struct><struct><var name="key"><string>mnu_go_schedule</string></var><var name="value"><string>時程表</string></var><var name="description"><string>Menu bar Go to Schedule Tab</string></var></struct><struct><var name="key"><string>refresh_btn</string></var><var name="value"><string>重新整理</string></var><var name="description"><string>Refresh button</string></var></struct><struct><var name="key"><string>help_btn</string></var><var name="value"><string>輔助</string></var><var name="description"><string>Help button</string></var></struct><struct><var name="key"><string>cv_activity_helpURL_undefined</string></var><var name="value"><string>無法找到{0}的幫助頁面</string></var><var name="description"><string>Alert message when a tool activity has no help url defined.</string></var></struct><struct><var name="key"><string>cv_design_unsaved_live_edit</string></var><var name="value"><string>未保存的修改將被自動保存，您想要繼續插入/合併嗎？</string></var><var name="description"><string>Confirm alert message displayed when doing an insert/merge to a modified design in Live Edit.</string></var></struct><struct><var name="key"><string>label.grouping.general.instructions.branching</string></var><var name="value"><string>您不能添加或移除分組中的小組，因為它正在被分支流程使用；並且添加或移除小組將影響到分支設置的分組。您只能在現有的小組中添加或移除使用者。</string></var><var name="description"><string>Third instructions paragraph on the chosen branching screen.</string></var></struct><struct><var name="key"><string>view_competences_dlg</string></var><var name="value"><string>檢視能力</string></var><var name="description"><string>Allows you to view all the competences within a learning design</string></var></struct><struct><var name="key"><string>view_act_mapped_competences</string></var><var name="value"><string>檢視映圖能力</string></var><var name="description"><string>Allows you to view competences mapped to a particular activity</string></var></struct><struct><var name="key"><string>mapped_competences_lbl</string></var><var name="value"><string>映圖能力</string></var><var name="description"><string>Title for the dialog that shows all competences mapped to an activity</string></var></struct><struct><var name="key"><string>competences_mapped_to_act_lbl</string></var><var name="value"><string>能力硬圖到{0}</string></var><var name="description"><string>Label in the Competence Mappings dialog to show all the competences mapped to an activity who's name is given by the argument</string></var></struct><struct><var name="key"><string>competence_title_lbl</string></var><var name="value"><string>標題</string></var><var name="description"><string>Competence Title label in Mapped Competences dialog</string></var></struct><struct><var name="key"><string>competence_desc_lbl</string></var><var name="value"><string>描述</string></var><var name="description"><string>Competence Description label in Mapped Competences dialog</string></var></struct><struct><var name="key"><string>al_activity_view_competence_mappings_invalid</string></var><var name="value"><string>請確定在查看能力硬圖前已選定一個活動。</string></var><var name="description"><string>Warning that appears when no activity is selected when the user tries to view competence mappings</string></var></struct><struct><var name="key"><string>order_learners_by_completion_lbl</string></var><var name="value"><string>按完成排序</string></var><var name="description"><string>Label for checkbox in index bar in the learners tab to order learners based how far they've progressed through the lesson</string></var></struct><struct><var name="key"><string>ls_manage_presenceEnabled_lbl</string></var><var name="value"><string>允許學習者查看誰在線上</string></var><var name="description"><string>ls_manage_presenceEnabled_lbl</string></var></struct><struct><var name="key"><string>ls_confirm_presence_enabled</string></var><var name="value"><string>現在學習者可以看誰在線上</string></var><var name="description"><string>ls_confirm_presence_enabled</string></var></struct><struct><var name="key"><string>ls_confirm_presence_disabled</string></var><var name="value"><string>學習者無法看到誰在線上</string></var><var name="description"><string>ls_confirm_presence_disabled</string></var></struct><struct><var name="key"><string>ls_win_learners_heading_class_lbl</string></var><var name="value"><string>課程</string></var><var name="description"><string>Heading on View Learners window panel (learners of the class).</string></var></struct><struct><var name="key"><string>ls_win_learners_heading_activity_lbl</string></var><var name="value"><string>活動</string></var><var name="description"><string>Heading on View Learners window panel (learners at activity).</string></var></struct><struct><var name="key"><string>learner_plus_tooltip</string></var><var name="value"><string>{0}學習者。按兩下去看完整的名單</string></var><var name="description"><string>Tooltip message displayed when mouse-over the cross icon, displayed when there is a large amount of users at an activity.</string></var></struct><struct><var name="key"><string>al_alert</string></var><var name="value"><string>注意</string></var><var name="description"><string>Generic title for Alert window</string></var></struct><struct><var name="key"><string>al_cancel</string></var><var name="value"><string>取消</string></var><var name="description"><string>To Confirm title for LFError</string></var></struct><struct><var name="key"><string>al_confirm</string></var><var name="value"><string>確認</string></var><var name="description"><string>To Confirm title for LFError</string></var></struct><struct><var name="key"><string>al_ok</string></var><var name="value"><string>好</string></var><var name="description"><string>OK on the alert dialog</string></var></struct><struct><var name="key"><string>app_chk_langload</string></var><var name="value"><string>語言資料還未被載入</string></var><var name="description"><string>message for unsuccessful language loading</string></var></struct><struct><var name="key"><string>app_chk_themeload</string></var><var name="value"><string>主題資料還未被載入</string></var><var name="description"><string>message for unsuccessful theme loading</string></var></struct><struct><var name="key"><string>app_fail_continue</string></var><var name="value"><string>應用程式無法繼續。請聯絡技術支援</string></var><var name="description"><string>message if application cannot continue due to any error</string></var></struct><struct><var name="key"><string>db_datasend_confirm</string></var><var name="value"><string>謝謝您傳送資料到伺服器</string></var><var name="description"><string>Message when user sucessfully dumps data to the server</string></var></struct><struct><var name="key"><string>mnu_edit</string></var><var name="value"><string>編輯</string></var><var name="description"><string>Menu bar Edit</string></var></struct><struct><var name="key"><string>mnu_edit_copy</string></var><var name="value"><string>拷貝</string></var><var name="description"><string>Menu bar Edit &amp;gt; Copy</string></var></struct><struct><var name="key"><string>mnu_edit_cut</string></var><var name="value"><string>剪下</string></var><var name="description"><string>Menu bar Edit &amp;gt; Cut</string></var></struct><struct><var name="key"><string>mnu_edit_paste</string></var><var name="value"><string>貼上</string></var><var name="description"><string>Menu bar Edit &amp;gt; Paste</string></var></struct><struct><var name="key"><string>mnu_file</string></var><var name="value"><string>檔案</string></var><var name="description"><string>Menu bar File</string></var></struct><struct><var name="key"><string>mnu_file_refresh</string></var><var name="value"><string>重新整理</string></var><var name="description"><string>Menu bar Refresh</string></var></struct><struct><var name="key"><string>mnu_file_editclass</string></var><var name="value"><string>編輯</string></var><var name="description"><string>Menu bar Edit Class</string></var></struct><struct><var name="key"><string>mnu_file_start</string></var><var name="value"><string>開始</string></var><var name="description"><string>Menu bar Start</string></var></struct><struct><var name="key"><string>mnu_help</string></var><var name="value"><string>幫助</string></var><var name="description"><string>Menu bar Help</string></var></struct><struct><var name="key"><string>mnu_help_abt</string></var><var name="value"><string>有關</string></var><var name="description"><string>Menu bar About</string></var></struct><struct><var name="key"><string>perm_act_lbl</string></var><var name="value"><string>允許</string></var><var name="description"><string>Label for permission gate activity</string></var></struct><struct><var name="key"><string>sched_act_lbl</string></var><var name="value"><string>行程</string></var><var name="description"><string>Label for schedule gate activity</string></var></struct><struct><var name="key"><string>synch_act_lbl</string></var><var name="value"><string>同步</string></var><var name="description"><string>Used as a label for the Synch Gate Activity Type</string></var></struct><struct><var name="key"><string>ws_Root</string></var><var name="value"><string>根目錄</string></var><var name="description"><string>Root folder title for workspace</string></var></struct><struct><var name="key"><string>ws_dlg_cancel_button</string></var><var name="value"><string>取消</string></var><var name="description"><string>2</string></var></struct><struct><var name="key"><string>ws_dlg_location_button</string></var><var name="value"><string>地點</string></var><var name="description"><string>Workspace dialogue Location btn label</string></var></struct><struct><var name="key"><string>ws_tree_mywsp</string></var><var name="value"><string>我的工作空間</string></var><var name="description"><string>The root level of the tree</string></var></struct><struct><var name="key"><string>ws_tree_orgs</string></var><var name="value"><string>組織</string></var><var name="description"><string>Shown in the top level of the tree in the workspace</string></var></struct><struct><var name="key"><string>sys_error_msg_start</string></var><var name="value"><string>系統錯誤發生</string></var><var name="description"><string>Common System error message starting line</string></var></struct><struct><var name="key"><string>mnu_view_learners</string></var><var name="value"><string>學習者...</string></var><var name="description"><string>Menu bar Learners</string></var></struct><struct><var name="key"><string>mnu_go</string></var><var name="value"><string>啟用</string></var><var name="description"><string>Menu bar Go</string></var></struct><struct><var name="key"><string>mnu_go_learners</string></var><var name="value"><string>學習者</string></var><var name="description"><string>Menu bar Go to Learners Tab</string></var></struct><struct><var name="key"><string>mnu_go_todo</string></var><var name="value"><string>執行</string></var><var name="description"><string>Menu bar Todo</string></var></struct><struct><var name="key"><string>mnu_help_help</string></var><var name="value"><string>監視</string></var><var name="description"><string>Menu bar Help item</string></var></struct><struct><var name="key"><string>mtab_learners</string></var><var name="value"><string>學習者</string></var><var name="description"><string>Monitor Learners tab</string></var></struct><struct><var name="key"><string>mtab_todo</string></var><var name="value"><string>執行</string></var><var name="description"><string>Monitor Todo tab</string></var></struct><struct><var name="key"><string>ls_learners_lbl</string></var><var name="value"><string>學習者</string></var><var name="description"><string>Learner label - Lesson details</string></var></struct><struct><var name="key"><string>ls_class_lbl</string></var><var name="value"><string>課程</string></var><var name="description"><string>Class label - Lesson details</string></var></struct><struct><var name="key"><string>sys_error_msg_finish</string></var><var name="value"><string>你需要重新啟動LAMS設計來繼續。你想保留下列有關這個錯誤的資訊來幫助解決這個問題嗎？</string></var><var name="description"><string>Common System error message finish paragraph</string></var></struct><struct><var name="key"><string>al_validation_schtime</string></var><var name="value"><string>請輸入一個有效的時間</string></var><var name="description"><string>Alert message when user enters an invalid time for schedule start</string></var></struct><struct><var name="key"><string>finish_learner_tooltip</string></var><var name="value"><string>要強制一位學習者結束課程，請將該學習者的圖示拖到此欄並釋放該圖示</string></var><var name="description"><string>Rollover message when user moves their mouse over the end gate bar in monitor tab view</string></var></struct><struct><var name="key"><string>ccm_monitor_activity</string></var><var name="value"><string>開啟活動監視器</string></var><var name="description"><string>Label for Custom Context Monitor Activity</string></var></struct><struct><var name="key"><string>ccm_monitor_activityhelp</string></var><var name="value"><string>監視活動輔助</string></var><var name="description"><string>Label for Custom Context Monitor Activity Help</string></var></struct><struct><var name="key"><string>learner_viewJournals_btn</string></var><var name="value"><string>日記記錄</string></var><var name="description"><string>Label for Journal Entries button used on Learners tab to view all journal entires for the lesson.</string></var></struct><struct><var name="key"><string>learner_viewJournals_btn_tooltip</string></var><var name="value"><string>檢視學習者所有儲存的日記記錄</string></var><var name="description"><string>tool tip message for Journal Entries button used on Learner tab to view all journal entires for the lesson.</string></var></struct><struct><var name="key"><string>ls_learnerURL_lbl</string></var><var name="value"><string>壆習者URL:</string></var><var name="description"><string>Learner URL:</string></var></struct><struct><var name="key"><string>ls_remove_confirm_msg</string></var><var name="value"><string>您已經選擇移除該課程，移除的課程將不能再獲取，繼續嗎？</string></var><var name="description"><string>remove confirm msg</string></var></struct><struct><var name="key"><string>ls_status_cmb_remove</string></var><var name="value"><string>移除</string></var><var name="description"><string>Lesson status option - Remove</string></var></struct><struct><var name="key"><string>ls_status_removed_lbl</string></var><var name="value"><string>已移除</string></var><var name="description"><string>Current status description if deleted (removed) lesson.</string></var></struct><struct><var name="key"><string>al_yes</string></var><var name="value"><string>是</string></var><var name="description"><string>Yes on the alert dialog</string></var></struct><struct><var name="key"><string>al_no</string></var><var name="value"><string>否</string></var><var name="description"><string>'No' on the alert dialog</string></var></struct><struct><var name="key"><string>ls_remove_warning_msg</string></var><var name="value"><string>警告:此課程將被移除。你要保存此課程嗎?</string></var><var name="description"><string>Message for the alert dialog which appears following confirmation dialog for removing a lesson.</string></var></struct><struct><var name="key"><string>learners_group_name</string></var><var name="value"><string>{0}學習者</string></var><var name="description"><string>Group name for the class's learners group.</string></var></struct><struct><var name="key"><string>staff_group_name</string></var><var name="value"><string>{0}監視</string></var><var name="description"><string>Group name for the class's staff group.</string></var></struct><struct><var name="key"><string>check_avail_btn</string></var><var name="value"><string>檢查可使用的標示</string></var><var name="description"><string>Check Availability button label</string></var></struct><struct><var name="key"><string>continue_btn</string></var><var name="value"><string>繼續</string></var><var name="description"><string>Continue button label</string></var></struct><struct><var name="key"><string>ls_continue_lbl</string></var><var name="value"><string>嗨{1}，你尚未完成編輯{0}</string></var><var name="description"><string>Continue message label</string></var></struct><struct><var name="key"><string>ls_sequence_live_edit_btn</string></var><var name="value"><string>即時編輯</string></var><var name="description"><string>Live Edit button</string></var></struct><struct><var name="key"><string>ls_sequence_live_edit_btn_tooltip</string></var><var name="value"><string>編輯此課程的設計</string></var><var name="description"><string>Tool tip message for Live Edit button</string></var></struct><struct><var name="key"><string>msg_bubble_check_action_lbl</string></var><var name="value"><string>檢查...</string></var><var name="description"><string>Label displayed when checking availability of lesson.</string></var></struct><struct><var name="key"><string>msg_bubble_failed_action_lbl</string></var><var name="value"><string>不可用，請再試ㄧ次</string></var><var name="description"><string>Label displayed when check failed i.e. lesson is still locked.</string></var></struct><struct><var name="key"><string>ls_locked_msg_lbl</string></var><var name="value"><string>抱歉，{0}目前被{1}編輯中</string></var><var name="description"><string>Warning message on Monitor locked screen.</string></var></struct><struct><var name="key"><string>al_confirm_live_edit</string></var><var name="value"><string>你將開啟即時編輯，你想繼續嗎?</string></var><var name="description"><string>Confirm warning (dialog) message displayed when opening Live Edit.</string></var></struct><struct><var name="key"><string>al_send</string></var><var name="value"><string>送出</string></var><var name="description"><string>Send button label on the system error dialog</string></var></struct><struct><var name="key"><string>about_popup_title_lbl</string></var><var name="value"><string>有關- {0}</string></var><var name="description"><string>Title for the About Pop-up window.</string></var></struct><struct><var name="key"><string>about_popup_version_lbl</string></var><var name="value"><string>版本</string></var><var name="description"><string>Label displaying the version no on the About dialog.</string></var></struct><struct><var name="key"><string>about_popup_copyright_lbl</string></var><var name="value"><string>© 2002-2009 {0} 基金會</string></var><var name="description"><string>Label displaying copyright statement in About dialog.</string></var></struct><struct><var name="key"><string>about_popup_trademark_lbl</string></var><var name="value"><string> {0} 是{0}基金會( {1} )的註冊商標</string></var><var name="description"><string>Label displaying the trademark statement in the About dialog.</string></var></struct><struct><var name="key"><string>about_popup_license_lbl</string></var><var name="value"><string>該軟體是一個自由軟體; 您可以重新發佈並/或修改它，前提是您必須遵守自由軟體組織發佈的準則。</string></var><var name="description"><string>Label displaying the license statement in the About dialog.</string></var></struct><struct><var name="key"><string>stream_reference_lbl</string></var><var name="value"><string>LAMS</string></var><var name="description"><string>Reference label for the application stream.</string></var></struct><struct><var name="key"><string>ls_manage_class_lbl</string></var><var name="value"><string>課程:</string></var><var name="description"><string>Class managing label - Lesson details</string></var></struct><struct><var name="key"><string>ls_manage_status_lbl</string></var><var name="value"><string>改變狀態:</string></var><var name="description"><string>Status managing label - Lesson details</string></var></struct><struct><var name="key"><string>ls_manage_start_lbl</string></var><var name="value"><string>開始:</string></var><var name="description"><string>Start managing label - Lesson details</string></var></struct><struct><var name="key"><string>ls_manage_learners_btn</string></var><var name="value"><string>檢視使用者</string></var><var name="description"><string>View learners button - Lesson details (manage section)</string></var></struct><struct><var name="key"><string>ls_manage_editclass_btn</string></var><var name="value"><string>編輯課程</string></var><var name="description"><string>Edit class button - Lesson details (manage section)</string></var></struct><struct><var name="key"><string>ls_manage_apply_btn</string></var><var name="value"><string>套用</string></var><var name="description"><string>Status Apply button - Lesson details (manage section)</string></var></struct><struct><var name="key"><string>ls_manage_schedule_btn</string></var><var name="value"><string>行程</string></var><var name="description"><string>Schedule start button - Lesson details (manage section)</string></var></struct><struct><var name="key"><string>ls_manage_start_btn</string></var><var name="value"><string>現在開始</string></var><var name="description"><string>Start immediately button - Lesson details (manage section)</string></var></struct><struct><var name="key"><string>ls_manage_date_lbl</string></var><var name="value"><string>日期</string></var><var name="description"><string>Date field title - Lesson details (manage section)</string></var></struct><struct><var name="key"><string>ls_duration_lbl</string></var><var name="value"><string>持續時間</string></var><var name="description"><string>Elapsed duration of lesson - Lesson details</string></var></struct><struct><var name="key"><string>ls_manage_status_cmb</string></var><var name="value"><string>選擇狀態</string></var><var name="description"><string>Status combo top  (index) item - Lesson details (manage section)</string></var></struct><struct><var name="key"><string>ls_status_cmb_activate</string></var><var name="value"><string>啟用</string></var><var name="description"><string>Lesson status option - Activate</string></var></struct><struct><var name="key"><string>ls_status_cmb_disable</string></var><var name="value"><string>關閉</string></var><var name="description"><string>Lesson status option - Disable (suspend)</string></var></struct><struct><var name="key"><string>ls_status_cmb_enable</string></var><var name="value"><string>啟用</string></var><var name="description"><string>Lesson status option - Enable (make active/unsuspend)</string></var></struct><struct><var name="key"><string>ls_status_cmb_archive</string></var><var name="value"><string>檔案櫃</string></var><var name="description"><string>Lesson status option - Archive</string></var></struct><struct><var name="key"><string>ls_status_active_lbl</string></var><var name="value"><string>已建立但尚未啟用</string></var><var name="description"><string>Current status description if active (enabled)</string></var></struct><struct><var name="key"><string>ls_status_disabled_lbl</string></var><var name="value"><string>已經關閉</string></var><var name="description"><string>Current status description if suspended (disabled)</string></var></struct><struct><var name="key"><string>ls_status_archived_lbl</string></var><var name="value"><string>已歸檔</string></var><var name="description"><string>Current status description if archvied</string></var></struct><struct><var name="key"><string>ls_status_started_lbl</string></var><var name="value"><string>已經啟用</string></var><var name="description"><string>Current status description if started (enabled)</string></var></struct><struct><var name="key"><string>ls_win_editclass_title</string></var><var name="value"><string>編輯課程</string></var><var name="description"><string>Edit class window title</string></var></struct><struct><var name="key"><string>ls_win_learners_title</string></var><var name="value"><string>檢視學習者</string></var><var name="description"><string>View learners window title</string></var></struct><struct><var name="key"><string>mnu_view</string></var><var name="value"><string>檢視</string></var><var name="description"><string>Menu bar View</string></var></struct><struct><var name="key"><string>ls_win_editclass_save_btn</string></var><var name="value"><string>儲存</string></var><var name="description"><string>Save button on Edit Class popup</string></var></struct><struct><var name="key"><string>ls_win_editclass_cancel_btn</string></var><var name="value"><string>取消</string></var><var name="description"><string>Cancel button on Edit Class popup</string></var></struct><struct><var name="key"><string>ls_win_learners_close_btn</string></var><var name="value"><string>結束</string></var><var name="description"><string>Close button on View Learners popup</string></var></struct><struct><var name="key"><string>ls_win_editclass_organisation_lbl</string></var><var name="value"><string>組織</string></var><var name="description"><string>Heading for Organisation tree on Edit Class popup</string></var></struct><struct><var name="key"><string>ls_win_editclass_staff_lbl</string></var><var name="value"><string>監視</string></var><var name="description"><string>Heading for Staff list on Edit Class popup</string></var></struct><struct><var name="key"><string>ls_win_editclass_learners_lbl</string></var><var name="value"><string>學習者</string></var><var name="description"><string>Heading for Learners list on the Edit Class popup</string></var></struct><struct><var name="key"><string>ls_win_learners_heading_lbl</string></var><var name="value"><string>學習者於{0}: {1} </string></var><var name="description"><string>Heading on View Learners window panel.</string></var></struct><struct><var name="key"><string>td_desc_heading</string></var><var name="value"><string>進階控制</string></var><var name="description"><string>Todo tab description heading</string></var></struct><struct><var name="key"><string>opt_activity_title</string></var><var name="value"><string>選擇性活動</string></var><var name="description"><string>Title for Optional Activity on canvas (monitoring)</string></var></struct><struct><var name="key"><string>lbl_num_activities</string></var><var name="value"><string>{0} - 活動</string></var><var name="description"><string>Number of child activities for Complex activity shown on canvas.</string></var></struct><struct><var name="key"><string>ls_of_text</string></var><var name="value"><string>的</string></var><var name="description"><string>i.e. 1 of 10 Used for showing how many learners have started</string></var></struct><struct><var name="key"><string>ls_manage_txt</string></var><var name="value"><string>管理課程</string></var><var name="description"><string>Heading for Management section of Lesson Tab</string></var></struct><struct><var name="key"><string>gpl_license_url</string></var><var name="value"><string>www.gnu.org/licenses/gpl.txt </string></var><var name="description"><string>URL address for GPL licence.</string></var></struct><struct><var name="key"><string>td_goContribute_btn</string></var><var name="value"><string>執行</string></var><var name="description"><string>Go button on contribute entry item</string></var></struct><struct><var name="key"><string>learner_exportPortfolio_btn</string></var><var name="value"><string>輸出檔案</string></var><var name="description"><string>Label for Export Portfolio used both on learners tab to export learner data and monitor tab to export class data</string></var></struct><struct><var name="key"><string>ls_status_scheduled_lbl</string></var><var name="value"><string>已排定時程</string></var><var name="description"><string>Lesson status option - Scheduled (Not Started)</string></var></struct><struct><var name="key"><string>stream_url</string></var><var name="value"><string>http://{0}foundation.org </string></var><var name="description"><string>URL address for the application stream.</string></var></struct><struct><var name="key"><string>ls_manage_learnerExpp_lbl</string></var><var name="value"><string>啟動給學習者的檔案夾</string></var><var name="description"><string>Label for Enable export portfolio for Learner</string></var></struct><struct><var name="key"><string>ls_confirm_expp_enabled</string></var><var name="value"><string>輸出檔案夾已經啟動給學習者</string></var><var name="description"><string>Confirmation message on enabling export portfolio for learners</string></var></struct><struct><var name="key"><string>al_confirm_forcecomplete_toactivity</string></var><var name="value"><string>你確認要強迫學習者'{0}'完活動'{1}'嗎？</string></var><var name="description"><string>Message to get confirmation from user before send data to server for force complete a learner to the activity it has been dropped</string></var></struct><struct><var name="key"><string>ls_tasks_txt</string></var><var name="value"><string>必要的工作項目</string></var><var name="description"><string>Heading for Required Tasks (todo section of Lesson tab)</string></var></struct><struct><var name="key"><string>ls_confirm_expp_disabled</string></var><var name="value"><string>對學習者的輸出檔案夾已經關閉</string></var><var name="description"><string>Confirmation message on disabling export portfolio for learners</string></var></struct><struct><var name="key"><string>td_desc_text</string></var><var name="value"><string>使用這個Todo標籤不是完編程列所必需的。更多資訊請看幫助頁面。這個特徵已完全功能化。</string></var><var name="description"><string>Todo tab description</string></var></struct><struct><var name="key"><string>al_error_forcecomplete_invalidactivity</string></var><var name="value"><string>你已經將學習者'{0}'置於當前或已完成的活動'{1}'中了</string></var><var name="description"><string>Error message when learner has been dropped on its previous or on its current activity</string></var></struct><struct><var name="key"><string>al_confirm_forcecomplete_tofinish</string></var><var name="value"><string>你確信你想強迫完成學習者'{0}'到課程結尾嗎？</string></var><var name="description"><string>Message to get confirmation from user before sending data to server for force complete to the end of lesson</string></var></struct><struct><var name="key"><string>al_error_forcecomplete_notarget</string></var><var name="value"><string>請安置學習者{0}瑜課程結束的活動中</string></var><var name="description"><string>Error Message when learner has been dropped outside of an activity or end of lesson bar at the bottom on the canvas</string></var></struct><struct><var name="key"><string>title_sequencetab_endGate</string></var><var name="value"><string>已完成的學習者</string></var><var name="description"><string>Title for end gate bar shown at the bottom of monitor tab where user can drop a learner to force complete to the end of lesson</string></var></struct><struct><var name="key"><string>goContribute_btn_tooltip</string></var><var name="value"><string>現在完成這個項目</string></var><var name="description"><string>tool tip message for go button in required tasks list in lesson tab</string></var></struct><struct><var name="key"><string>help_btn_tooltip</string></var><var name="value"><string>幫助</string></var><var name="description"><string>tool tip message for help button in toolbar</string></var></struct><struct><var name="key"><string>refresh_btn_tooltip</string></var><var name="value"><string>重新載入最近的進度資料給學習者</string></var><var name="description"><string>tool tip message for the refresh button</string></var></struct><struct><var name="key"><string>ls_manage_editclass_btn_tooltip</string></var><var name="value"><string>編輯學習者的名單與此課程的監視視窗</string></var><var name="description"><string>tool tip message for the edit class button in lesson tab under manage lesson section</string></var></struct><struct><var name="key"><string>ls_manage_learners_btn_tooltip</string></var><var name="value"><string>顯示此課程所有的學習者</string></var><var name="description"><string>tool tip message for the view learners button in lesson tab under manage lesson section</string></var></struct><struct><var name="key"><string>ls_manage_apply_btn_tooltip</string></var><var name="value"><string>根據下拉的選項改變課程的狀態</string></var><var name="description"><string>tool tip message for the apply button in lesson tab under manage lesson section to change the lesson status</string></var></struct><struct><var name="key"><string>ls_continue_action_lbl</string></var><var name="value"><string>按下{0}去進行</string></var><var name="description"><string>Action label displayed when a user can proceed to Live Edit.</string></var></struct><struct><var name="key"><string>learner_exportPortfolio_btn_tooltip</string></var><var name="value"><string>輸出此學習者的檔案夾並儲存於電腦中以未來參考</string></var><var name="description"><string>tool tip message for exportportfolio button for individual learner to export portfolio for the respective learner and save to it in on user computer for future reference</string></var></struct><struct><var name="key"><string>lbl_num_sequences</string></var><var name="value"><string>{0} - 編程</string></var><var name="description"><string>Number of child sequence or Optional Sequences activity shown on canvas.</string></var></struct><struct><var name="key"><string>class_exportPortfolio_btn_tooltip</string></var><var name="value"><string>輸出此課程的檔案夾並儲存於電腦中以供未來參考</string></var><var name="description"><string>tool tip message for exportportfolio button next to refresh button to export class portfolio and save in on user computer</string></var></struct><struct><var name="key"><string>ls_manage_start_btn_tooltip</string></var><var name="value"><string>送出</string></var><var name="description"><string>tool tip message for the start now button in lesson tab under manage lesson section when staff has not yet started the lesson while creating a lesson</string></var></struct><struct><var name="key"><string>ls_manage_schedule_btn_tooltip</string></var><var name="value"><string>安排課程起始在一個未來的時間</string></var><var name="description"><string>tool tip message for the schedule button in lesson tab under manage lesson section to shedule the lesson to start of selected date and time</string></var></struct><struct><var name="key"><string>current_act_tooltip</string></var><var name="value"><string>請按兩下去檢視進行中的學習者的現在活動付出</string></var><var name="description"><string>tool tip message for current activity icon</string></var></struct><struct><var name="key"><string>completed_act_tooltip</string></var><var name="value"><string>請按兩下去檢視學習者的完成活動進行中的付出</string></var><var name="description"><string>tool tip message for completed activity icon</string></var></struct><struct><var name="key"><string>al_doubleclick_todoactivity</string></var><var name="value"><string>抱歉，學習者:{0}尚未達到這項活動:{1}</string></var><var name="description"><string>alert message when user double click on the todo activity in the sequence under learner tab</string></var></struct><struct><var name="key"><string>al_validation_schstart</string></var><var name="value"><string>日期未選定，請選擇一個日期與時間</string></var><var name="description"><string>Message when no date is selected for starting a lesson by schedule.</string></var></struct><struct><var name="key"><string>ls_manage_time_lbl</string></var><var name="value"><string>時間(小時:分)</string></var><var name="description"><string>Time fields title - Lesson details (manage section)</string></var></struct><struct><var name="key"><string>al_activity_openContent_invalid</string></var><var name="value"><string>對不起，在您右擊滑鼠選擇打開/編輯活動功能表之前，請選擇該活動。</string></var><var name="description"><string>alert message when user click Open/Edit Activity Content menu item in context menu before selecting any activity on the canvas</string></var></struct><struct><var name="key"><string>mv_search_default_txt</string></var><var name="value"><string>輸入搜尋字串或頁碼</string></var><var name="description"><string>The text that is initially displayed in the search/index text field. Search query corresponds to all or part of a learners' name and page number corresponds to a specific page of learners. The user will enter something and then click on the 'Go' button, after which the results will be displayed.</string></var></struct><struct><var name="key"><string>mv_search_error_msg</string></var><var name="value"><string>請輸入搜尋字串或介於1和{0}頁碼</string></var><var name="description"><string>This error message appears if the search/index field is blank when the user clicks the 'Go' button.</string></var></struct><struct><var name="key"><string>mv_search_invalid_input_msg</string></var><var name="value"><string>頁碼必須介於1和{0}</string></var><var name="description"><string>This error message appears if the number entered by the user lies outside the range of viewable pages.</string></var></struct><struct><var name="key"><string>mv_search_not_found_msg</string></var><var name="value"><string>{0}沒有找到</string></var><var name="description"><string>This message appears when the search does not find any learners whose names contain the search parameter.</string></var></struct><struct><var name="key"><string>mv_search_current_page_lbl</string></var><var name="value"><string>頁面{0}的{1}</string></var><var name="description"><string>{0} is the page we are on now and {1} is the number of pages</string></var></struct><struct><var name="key"><string>mv_search_go_btn_lbl</string></var><var name="value"><string>啟動</string></var><var name="description"><string>If the learner entered text into the index/search field, clicking this button will search all started learners names for the text they entered, otherwise if they entered a number and clicked go. It will show the contents of the page, whose number they entered.</string></var></struct><struct><var name="key"><string>mv_search_index_view_btn_lbl</string></var><var name="value"><string>目錄檢視</string></var><var name="description"><string>When the user clicks this button, they will be returning from the search view to the index view. It will once again allow them to view all the available pages, and navigate to them directly. This button is only visible when the user is in the search view.</string></var></struct><struct><var name="key"><string>close_mc_tooltip</string></var><var name="value"><string>最小話</string></var><var name="description"><string>Tooltip message for close button on Branching canvas.</string></var></struct><struct><var name="key"><string>al_confirm_forcecomplete_to_end_of_branching_seq</string></var><var name="value"><string>你確定要強制學習者{0}結束該分支流程嗎？</string></var><var name="description"><string>This confirmation dialog appears after a learner icon has been dropped on the finish door within the branching view.</string></var></struct><struct><var name="key"><string>al_error_forcecomplete_to_different_seq</string></var><var name="value"><string>{0}不能被強制拖到不同分支或流程的活動中</string></var><var name="description"><string>This alert appears when either: The learner is in a branching sequence and the monitor tries to force complete them to an activity in a different branching sequence, or: the learner is in an optional sequence and the monitor tries to force complete them to an activity in a different optional sequence</string></var></struct><struct><var name="key"><string>ls_seq_status_moderation</string></var><var name="value"><string>主導</string></var><var name="description"><string>Displayed when we want the Teacher to moderate an activitiy (for example a chat room)</string></var></struct><struct><var name="key"><string>ls_seq_status_define_later</string></var><var name="value"><string>稍後定義</string></var><var name="description"><string>Of an Activity: when the content for the Activity must defined in the Lesson (via Monitoring) rather than by the Author</string></var></struct><struct><var name="key"><string>ls_seq_status_perm_gate</string></var><var name="value"><string>許可閘門</string></var><var name="description"><string>A type of Gate Activity where progress depends on permission from a Teacher</string></var></struct><struct><var name="key"><string>ls_seq_status_synch_gate</string></var><var name="value"><string>同步閘門</string></var><var name="description"><string>A type of Gate Activity where progress depends on all Learners in the Class or Group reaching the activity</string></var></struct><struct><var name="key"><string>ls_seq_status_choose_grouping</string></var><var name="value"><string>選擇群組</string></var><var name="description"><string>Allows the Teacher to add the learners to chosen groups</string></var></struct><struct><var name="key"><string>ls_seq_status_contribution</string></var><var name="value"><string>付出</string></var><var name="description"><string>Any 'Contributions' to be made by a monitor, such as editing text for 'Define in Monitor' tasks, marking essay/reports, releasing stop points, etc.</string></var></struct><struct><var name="key"><string>ls_seq_status_system_gate</string></var><var name="value"><string>系統閘門</string></var><var name="description"><string>A System Gate is a stop point that can be controlled by time setting or user control</string></var></struct><struct><var name="key"><string>ls_seq_status_teacher_branching</string></var><var name="value"><string>敎師選則分支</string></var><var name="description"><string>A type of branching where the Teacher chooses which learners to add to each branch</string></var></struct></array></var></struct></data></wddxPacket>
\ No newline at end of file
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/preloaderStyle.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/wizard/ar_JO_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/wizard/cy_GB_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/wizard/da_DK_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/wizard/de_DE_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/wizard/el_GR_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/wizard/en_AU_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/wizard/en_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/wizard/es_ES_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/wizard/fr_FR_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/wizard/hu_HU_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/wizard/it_IT_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/wizard/ja_JP_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/wizard/ko_KR_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/wizard/mi_NZ_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/wizard/ms_MY_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/wizard/nl_BE_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/wizard/no_NO_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/wizard/pl_PL_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/wizard/pt_BR_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/wizard/ru_RU_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/wizard/sv_SE_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/wizard/tr_TR_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/wizard/vi_VN_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 178d7f1d673c2a38fd68e9727e5ec1fea5b56c89 refers to a dead (removed) revision in file `lams_central/web/flashxml/wizard/zh_CN_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/web/flashxml/wizard/zh_TW_dictionary.xml
===================================================================
diff -u
--- lams_central/web/flashxml/wizard/zh_TW_dictionary.xml	(revision 0)
+++ lams_central/web/flashxml/wizard/zh_TW_dictionary.xml	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
@@ -0,0 +1 @@
+<wddxPacket version="1.0"><!-- CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Thu Feb 19 23:14:29 CST 2009 --><header/><data><struct><var name="messageKey"><string>getDictionary</string></var><var name="messageType"><number>3</number></var><var name="messageValue"><array length="63"><struct><var name="key"><string>date_lbl</string></var><var name="value"><string>日期</string></var><var name="description"><string>Label for Schedule Date field</string></var></struct><struct><var name="key"><string>time_lbl</string></var><var name="value"><string>時間(小時:分)</string></var><var name="description"><string>Label for Schedule Time field</string></var></struct><struct><var name="key"><string>wizard_selAll_cb_lbl</string></var><var name="value"><string>選擇所有</string></var><var name="description"><string>Label for select all check box used to select all staff or learner users in list.</string></var></struct><struct><var name="key"><string>learners_group_name</string></var><var name="value"><string>{0}學習者</string></var><var name="description"><string>Group name for the class's learners group.</string></var></struct><struct><var name="key"><string>staff_group_name</string></var><var name="value"><string>{0}監視者</string></var><var name="description"><string>Group name for the class's staff group.</string></var></struct><struct><var name="key"><string>addmore_btn</string></var><var name="value"><string>加入另一個課程</string></var><var name="description"><string>Button to add another lesson, return to first step.</string></var></struct><struct><var name="key"><string>wizard_learner_enpres_cb_lbl</string></var><var name="value"><string>讓學習者看到誰在線上</string></var><var name="description"><string>Checkbox label for presence</string></var></struct><struct><var name="key"><string>wizard_splitLearners_leanersInGroup_lbl</string></var><var name="value"><string>此群組的學習者</string></var><var name="description"><string>wizard_splitLearners_leanersInGroup_lbl</string></var></struct><struct><var name="key"><string>wizard_splitLearners_LearnersPerLesson_lbl</string></var><var name="value"><string>每一個課程的學習者</string></var><var name="description"><string>wizard_splitLearners_LearnersPerLesson_lbl</string></var></struct><struct><var name="key"><string>wizard_learner_enLiveEdit_cb_lbl</string></var><var name="value"><string>啟動即時編輯</string></var><var name="description"><string>wizard_learner_enLiveEdit_cb_lbl</string></var></struct><struct><var name="key"><string>confirmMsg_4_txt</string></var><var name="value"><string>{0}事件的{1}已經開始</string></var><var name="description"><string>Conclusion screen description if starting several lessons</string></var></struct><struct><var name="key"><string>wizard_wkspc_date_modified_lbl</string></var><var name="value"><string>最後修訂:{0}</string></var><var name="description"><string>Shows the last modified datetime for a Learning Design.</string></var></struct><struct><var name="key"><string>wizardDesc_1_lbl</string></var><var name="value"><string>下面的資料夾包含課程所需的編程。選中一個，按“下一步”按鈕繼續。</string></var><var name="description"><string>Step 1 description</string></var></struct><struct><var name="key"><string>wizardDesc_2_lbl</string></var><var name="value"><string>你可以為這個課程添加你想讓學習者看見的課程名稱和描述。</string></var><var name="description"><string>Step 2 description</string></var></struct><struct><var name="key"><string>wizard_splitLearners_splitSum</string></var><var name="value"><string>該課程中將要創立{0}個事件，並且將給每個課程安排大約{1}個學習者。</string></var><var name="description"><string>Split learners summary</string></var></struct><struct><var name="key"><string>wizardDesc_3_lbl</string></var><var name="value"><string>你可以通過不在他們名字旁邊的方框打勾，從而不從這個班級選擇學習者和堅督者。</string></var><var name="description"><string>Step 3 description</string></var></struct><struct><var name="key"><string>wizard_splitLearners_splitSumShort</string></var><var name="value"><string>該課程有{0}個事件，每個實例都安排了{1}個學習者</string></var><var name="description"><string>Shorter split learners summary</string></var></struct><struct><var name="key"><string>wizardDesc_4_lbl</string></var><var name="value"><string>通過按“開始”按鈕，你可以直接開始課程。你也可以確定課程的時間，並在特定的日期和時間開始。</string></var><var name="description"><string>Step 4 description</string></var></struct><struct><var name="key"><string>sys_error_msg_start</string></var><var name="value"><string>你無法建立一個課程</string></var><var name="description"><string>Common System error message starting line</string></var></struct><struct><var name="key"><string>wizard_learner_expp_cb_lbl</string></var><var name="value"><string>啟動輸出的資料夾給學習者</string></var><var name="description"><string>Label for Enable export portfolio for Learner</string></var></struct><struct><var name="key"><string>wizard_splitLearners_cb_lbl</string></var><var name="value"><string>你想將這些學習者分到不同的課程副本中去嗎？</string></var><var name="description"><string>wizard_splitLearners_cb_lbl</string></var></struct><struct><var name="key"><string>sys_error_msg_finish</string></var><var name="value"><string>你想要傳送ㄧ份錯誤報告嗎?</string></var><var name="description"><string>Common System error message finish paragraph</string></var></struct><struct><var name="key"><string>sys_error</string></var><var name="value"><string>系統錯誤</string></var><var name="description"><string>System Error elert window title</string></var></struct><struct><var name="key"><string>prev_btn</string></var><var name="value"><string>&lt; 前ㄧ步</string></var><var name="description"><string>Previous step button</string></var></struct><struct><var name="key"><string>next_btn</string></var><var name="value"><string>下一步 &gt;</string></var><var name="description"><string>Next step button</string></var></struct><struct><var name="key"><string>finish_btn</string></var><var name="value"><string>在監視器中開始</string></var><var name="description"><string>Finish button to complete wizard</string></var></struct><struct><var name="key"><string>cancel_btn</string></var><var name="value"><string>取消</string></var><var name="description"><string>Cancel button to exit wizard</string></var></struct><struct><var name="key"><string>close_btn</string></var><var name="value"><string>關閉</string></var><var name="description"><string>Close button to close window</string></var></struct><struct><var name="key"><string>start_btn</string></var><var name="value"><string>現在開始</string></var><var name="description"><string>Start button to start new lesson</string></var></struct><struct><var name="key"><string>title_lbl</string></var><var name="value"><string>標題</string></var><var name="description"><string>New Lesson title</string></var></struct><struct><var name="key"><string>desc_lbl</string></var><var name="value"><string>描述</string></var><var name="description"><string>New Lesson description</string></var></struct><struct><var name="key"><string>learner_lbl</string></var><var name="value"><string>學習者</string></var><var name="description"><string>Heading for list of class learners</string></var></struct><struct><var name="key"><string>staff_lbl</string></var><var name="value"><string>監視</string></var><var name="description"><string>Heading for list of class staff</string></var></struct><struct><var name="key"><string>schedule_cb_lbl</string></var><var name="value"><string>行程</string></var><var name="description"><string>Label for schedule checkbox</string></var></struct><struct><var name="key"><string>summery_lbl</string></var><var name="value"><string>總結</string></var><var name="description"><string>Heading for summery outline</string></var></struct><struct><var name="key"><string>ws_Root</string></var><var name="value"><string>根目錄</string></var><var name="description"><string>Root folder title for workspace</string></var></struct><struct><var name="key"><string>ws_tree_mywsp</string></var><var name="value"><string>我的工作空間</string></var><var name="description"><string>The root level of the workspace tree</string></var></struct><struct><var name="key"><string>wizardTitle_1_lbl</string></var><var name="value"><string>步驟1之3:選擇你的編程</string></var><var name="description"><string>Step 1 screen title</string></var></struct><struct><var name="key"><string>wizardTitle_2_lbl</string></var><var name="value"><string>課程細節</string></var><var name="description"><string>Step 2 screen title</string></var></struct><struct><var name="key"><string>wizardTitle_3_lbl</string></var><var name="value"><string>步驟2之3:選擇你的學習者與監視</string></var><var name="description"><string>Step 3 screen title</string></var></struct><struct><var name="key"><string>wizardTitle_4_lbl</string></var><var name="value"><string>步驟3之3:確認課程細節</string></var><var name="description"><string>Step 4 screen title</string></var></struct><struct><var name="key"><string>wizardTitle_x_lbl</string></var><var name="value"><string>課程:{0}</string></var><var name="description"><string>Confirmation screen title</string></var></struct><struct><var name="key"><string>al_alert</string></var><var name="value"><string>注意</string></var><var name="description"><string>Generic title for Alert window</string></var></struct><struct><var name="key"><string>al_cancel</string></var><var name="value"><string>取消</string></var><var name="description"><string>Cancel on alert dialog</string></var></struct><struct><var name="key"><string>al_confirm</string></var><var name="value"><string>確認</string></var><var name="description"><string>To Confirm title for LFError</string></var></struct><struct><var name="key"><string>al_ok</string></var><var name="value"><string>好</string></var><var name="description"><string>OK on alert dialog</string></var></struct><struct><var name="key"><string>al_validation_msg1</string></var><var name="value"><string>一個有效的編程必須選擇</string></var><var name="description"><string>Message when no design is selected on step 1</string></var></struct><struct><var name="key"><string>al_validation_msg2</string></var><var name="value"><string>標題是必須填的</string></var><var name="description"><string>Message when title field is empty on Step 2</string></var></struct><struct><var name="key"><string>al_validation_msg3_1</string></var><var name="value"><string>沒有課程或班級被選擇</string></var><var name="description"><string>Message when no course/class is selected in Step 3</string></var></struct><struct><var name="key"><string>al_validation_msg3_2</string></var><var name="value"><string>至少要選定一位監督者與學習者</string></var><var name="description"><string>Message when either no staff/learner users are selected in Step 3.</string></var></struct><struct><var name="key"><string>confirmMsg_1_txt</string></var><var name="value"><string>{0}已經開始</string></var><var name="description"><string>Conclusion screen description if lesson started</string></var></struct><struct><var name="key"><string>confirmMsg_2_txt</string></var><var name="value"><string>{0}已經排定開始於{1}。</string></var><var name="description"><string>Conclusion screen description if lesson scheduled</string></var></struct><struct><var name="key"><string>confirmMsg_3_txt</string></var><var name="value"><string>{0}已經建立但尚未開始</string></var><var name="description"><string>Conclusion screen description if lesson created but not started</string></var></struct><struct><var name="key"><string>al_validation_schstart</string></var><var name="value"><string>沒有選定日期。請選擇一個日期與時間，然後按下行程按鈕。</string></var><var name="description"><string>Message when no date is selected starting a lesson by schedule.</string></var></struct><struct><var name="key"><string>summery_design_lbl</string></var><var name="value"><string>編程</string></var><var name="description"><string>Label for summery heading of selected design field.</string></var></struct><struct><var name="key"><string>summery_title_lbl</string></var><var name="value"><string>標題</string></var><var name="description"><string>Label for summery heading of defined title.</string></var></struct><struct><var name="key"><string>summery_desc_lbl</string></var><var name="value"><string>描述</string></var><var name="description"><string>Label for summery heading of defined description.</string></var></struct><struct><var name="key"><string>summery_course_lbl</string></var><var name="value"><string>群組</string></var><var name="description"><string>Label for summery heading of selected course field.</string></var></struct><struct><var name="key"><string>summery_class_lbl</string></var><var name="value"><string>子群組</string></var><var name="description"><string>Label for summery heading of selected class field.</string></var></struct><struct><var name="key"><string>summery_staff_lbl</string></var><var name="value"><string>監視</string></var><var name="description"><string>Label for summery heading of number of selected staff in the lesson class.</string></var></struct><struct><var name="key"><string>summery_learners_lbl</string></var><var name="value"><string>學習者</string></var><var name="description"><string>Label for summery heading of number of selected learners in the lesson class.</string></var></struct><struct><var name="key"><string>al_send</string></var><var name="value"><string>送出</string></var><var name="description"><string>OK on system error dialog</string></var></struct><struct><var name="key"><string>al_validation_schtime</string></var><var name="value"><string>請輸入一個有效的名稱</string></var><var name="description"><string>Alert message when user enters an invalid time for schedule start</string></var></struct></array></var></struct></data></wddxPacket>
\ No newline at end of file
Index: lams_central/web/images/icons/user_offline.png
===================================================================
diff -u -r61df3f3f473a3619f93c63ceb879ae36438020e8 -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82
Binary files differ
Index: lams_central/web/images/icons/user_offline_blocked.png
===================================================================
diff -u
Binary files differ
Index: lams_central/web/images/icons/user_online_blocked.png
===================================================================
diff -u
Binary files differ
Index: lams_central/web/includes/javascript/jquery-ui/ui/ui.tabs.scrollable.js
===================================================================
diff -u -r61df3f3f473a3619f93c63ceb879ae36438020e8 -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82
--- lams_central/web/includes/javascript/jquery-ui/ui/ui.tabs.scrollable.js	(.../ui.tabs.scrollable.js)	(revision 61df3f3f473a3619f93c63ceb879ae36438020e8)
+++ lams_central/web/includes/javascript/jquery-ui/ui/ui.tabs.scrollable.js	(.../ui.tabs.scrollable.js)	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
@@ -358,26 +358,16 @@
 		});
 
 		if(o.scrollable){
-			/*
-			var totalWidth = 0;
-			
-			this.$lis.each(function(){
-				totalWidth += this.offsetWidth;
-			});
-			
-			totalWidth += (this.$lis.length - 1) * 7 + 3;
-			
-			this.scrollableWidth = totalWidth;
-			*/
-			
+			// calculate scrollableWidth			
 			if(this.$lis.length > 1){
 				var lastElem = this.$lis[this.$lis.length - 1];
 				var beforeLastElem = this.$lis[this.$lis.length - 2];
 				
+				// extra 15 pixels are for buffer to make sure the tabs don't wrap
 				if(this.$lis[0].offsetLeft != 0){
-					this.scrollableWidth = beforeLastElem.offsetLeft + beforeLastElem.offsetWidth + lastElem.offsetWidth;
+					this.scrollableWidth = beforeLastElem.offsetLeft + beforeLastElem.offsetWidth + lastElem.offsetWidth + 15;
 				}else{
-					this.scrollableWidth = this.$lis[0].parentNode.parentNode.offsetLeft + beforeLastElem.offsetLeft + beforeLastElem.offsetWidth + lastElem.offsetWidth;
+					this.scrollableWidth = this.$lis[0].parentNode.parentNode.offsetLeft + beforeLastElem.offsetLeft + beforeLastElem.offsetWidth + lastElem.offsetWidth + 15;
 				}
 			}
 			else{
@@ -388,7 +378,6 @@
 				}else{
 					this.scrollableWidth = this.$lis[0].parentNode.parentNode.offsetLeft + lastElem.offsetLeft + lastElem.offsetWidth;
 				}
-
 			}
 			
 			$(".ui-tabs-wrapped").css("width", this.scrollableWidth + "px");
Index: lams_common/db/sql/create_presence_chat_tables.sql
===================================================================
diff -u -rec61f5d738bce3513b4e5204e011a68476a9c165 -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82
--- lams_common/db/sql/create_presence_chat_tables.sql	(.../create_presence_chat_tables.sql)	(revision ec61f5d738bce3513b4e5204e011a68476a9c165)
+++ lams_common/db/sql/create_presence_chat_tables.sql	(.../create_presence_chat_tables.sql)	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
@@ -1,2 +1,11 @@
-drop table if exists lams_presence_chat_msgs;
-create table lams_presence_chat_msgs (uid bigint not null auto_increment, room_name varchar(255), from_user varchar(255), to_user varchar(255), date_sent datetime, message varchar(1023), primary key (uid))type=innodb;
+DROP TABLE IF EXISTS lams_presence_chat_msgs;
+CREATE TABLE lams_presence_chat_msgs (
+	uid bigint NOT NULL auto_increment,
+	room_name VARCHAR(255),
+	from_user VARCHAR(255),
+	to_user VARCHAR(255),
+	date_sent DATETIME,
+	message VARCHAR(1023),
+	PRIMARY KEY (uid)
+)TYPE=InnoDB;
+
Index: lams_common/db/sql/insert_lams_unix_config_data.sql
===================================================================
diff -u -ref3c00cf90e298143398acf37cbb263e80692eef -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82
--- lams_common/db/sql/insert_lams_unix_config_data.sql	(.../insert_lams_unix_config_data.sql)	(revision ef3c00cf90e298143398acf37cbb263e80692eef)
+++ lams_common/db/sql/insert_lams_unix_config_data.sql	(.../insert_lams_unix_config_data.sql)	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
@@ -248,7 +248,7 @@
 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);
+values ('Red5ServerUrl','', 'config.red5.server.url', 'config.header.red5', 'STRING', 0);
 
 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);
+values ('Red5RecordingsUrl','', 'config.red5.recordings.url', 'config.header.red5', 'STRING', 0);
Index: lams_common/db/sql/insert_lams_windows_config_data.sql
===================================================================
diff -u -ref3c00cf90e298143398acf37cbb263e80692eef -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82
--- lams_common/db/sql/insert_lams_windows_config_data.sql	(.../insert_lams_windows_config_data.sql)	(revision ef3c00cf90e298143398acf37cbb263e80692eef)
+++ lams_common/db/sql/insert_lams_windows_config_data.sql	(.../insert_lams_windows_config_data.sql)	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
@@ -248,7 +248,7 @@
 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);
+values ('Red5ServerUrl','', 'config.red5.server.url', 'config.header.red5', 'STRING', 0);
 
 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);
+values ('Red5RecordingsUrl','', 'config.red5.recordings.url', 'config.header.red5', 'STRING', 0);
Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql
===================================================================
diff -u -r72e01661ffe932634adbe4b229d9ee44d6928a45 -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql	(.../patch0015_updateFrom22.sql)	(revision 72e01661ffe932634adbe4b229d9ee44d6928a45)
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql	(.../patch0015_updateFrom22.sql)	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
@@ -114,6 +114,24 @@
 -- LDEV-2207 ------------ Adding flag in lesson to release marks for gradebook
 ALTER TABLE lams_lesson ADD COLUMN marks_released TINYINT DEFAULT 0;
 
+-- LDEV-2197 ------------ Presence Chat Logging
+CREATE TABLE lams_presence_chat_msgs (
+	uid bigint NOT NULL auto_increment,
+	room_name VARCHAR(255),
+	from_user VARCHAR(255),
+	to_user VARCHAR(255),
+	date_sent DATETIME,
+	message VARCHAR(1023),
+	PRIMARY KEY (uid)
+)TYPE=InnoDB;
+
+-- LDEV-2005 Video Recorder configuration stuff --------------
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('Red5ServerUrl','', 'config.red5.server.url', 'config.header.red5', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('Red5RecordingsUrl','', 'config.red5.recordings.url', 'config.header.red5', 'STRING', 0);
+
 ----------------------Put all sql statements above here-------------------------
 
 -- If there were no errors, commit and restore autocommit to on
Index: lams_common/src/java/org/lamsfoundation/lams/util/Base64StringToImageUtil.java
===================================================================
diff -u -r61df3f3f473a3619f93c63ceb879ae36438020e8 -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82
--- lams_common/src/java/org/lamsfoundation/lams/util/Base64StringToImageUtil.java	(.../Base64StringToImageUtil.java)	(revision 61df3f3f473a3619f93c63ceb879ae36438020e8)
+++ lams_common/src/java/org/lamsfoundation/lams/util/Base64StringToImageUtil.java	(.../Base64StringToImageUtil.java)	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
@@ -17,9 +17,11 @@
 	private static Logger log = Logger.getLogger(Base64StringToImageUtil.class);
 	
 	public static boolean create(String dir, String filename, String ext, String data){	
-		try {			
-			BASE64Decoder decoder = new BASE64Decoder();
+		try {
+			File fileDir = new File(dir);
+			fileDir.mkdirs();
 			
+			BASE64Decoder decoder = new BASE64Decoder();
 			byte[] byteArray = decoder.decodeBuffer(data);
 
 			InputStream in = new ByteArrayInputStream(byteArray);
Index: lams_flash/src/central/flex/VideoRecorder/src/AddCommentPopUp.mxml
===================================================================
diff -u -r61df3f3f473a3619f93c63ceb879ae36438020e8 -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82
--- lams_flash/src/central/flex/VideoRecorder/src/AddCommentPopUp.mxml	(.../AddCommentPopUp.mxml)	(revision 61df3f3f473a3619f93c63ceb879ae36438020e8)
+++ lams_flash/src/central/flex/VideoRecorder/src/AddCommentPopUp.mxml	(.../AddCommentPopUp.mxml)	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
@@ -3,6 +3,9 @@
 
 	<mx:Script>
         <![CDATA[
+        	import mx.controls.TextInput;
+        	import mx.managers.FocusManager;
+        	import mx.core.UIComponent;
         	import mx.events.ValidationResultEvent;
         	import mx.validators.Validator;
         	import org.lamsfoundation.lams.common.dictionary.XMLDictionary;       
@@ -13,7 +16,7 @@
 	       	[Bindable] private var formIsValid:Boolean = false;
 	       	
 		   	private function onCreationComplete():void{
-		   		this.focusManager.setFocus(commentInput);
+		   		focusManager.setFocus(commentInput);
 		   	}
 		   	
 		   	public function init(dictionary:XMLDictionary):void{
@@ -41,17 +44,18 @@
 			
 			// validate a given validator
 			private function validate(validator:Validator):Boolean
-			{                
+			{   
 				var validatorSource:DisplayObject = validator.source as DisplayObject;
+				var component:UIComponent = validator.source as UIComponent;
 				var suppressEvents:Boolean = (validatorSource != focussedFormControl);
 				var event:ValidationResultEvent = validator.validate(null, suppressEvents); 
 				var currentControlIsValid:Boolean = (event.type == ValidationResultEvent.VALID);
+
 				
 				formIsValid = formIsValid && currentControlIsValid;
 				
 				return currentControlIsValid;
 			}
-			
         ]]>
     </mx:Script>
     
Index: lams_flash/src/central/flex/VideoRecorder/src/GetRecordingDetailsPopUp.mxml
===================================================================
diff -u -r61df3f3f473a3619f93c63ceb879ae36438020e8 -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82
--- lams_flash/src/central/flex/VideoRecorder/src/GetRecordingDetailsPopUp.mxml	(.../GetRecordingDetailsPopUp.mxml)	(revision 61df3f3f473a3619f93c63ceb879ae36438020e8)
+++ lams_flash/src/central/flex/VideoRecorder/src/GetRecordingDetailsPopUp.mxml	(.../GetRecordingDetailsPopUp.mxml)	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
@@ -3,6 +3,7 @@
 
 	<mx:Script>
         <![CDATA[
+        	import mx.controls.TextInput;
         	import mx.controls.Alert;
         	import mx.core.UITextField;
         	import mx.managers.IFocusManagerComponent;
@@ -20,7 +21,7 @@
 		   	private function onCreationComplete():void{
 		   		focusManager.setFocus(titleInput);
 		   	}
-		   			   	
+		   	
 		   	public function init(dictionary:XMLDictionary):void{
 		   		this.dictionary = dictionary;
 		   		this.title = dictionary.getLabel("videorecorder.new.recording.details");
@@ -58,15 +59,15 @@
 			private function validate(validator:Validator):Boolean
 			{   
 				var validatorSource:DisplayObject = validator.source as DisplayObject;
+				var component:UIComponent = validator.source as UIComponent;
 				var suppressEvents:Boolean = (validatorSource != focussedFormControl);
 				var event:ValidationResultEvent = validator.validate(null, suppressEvents); 
 				var currentControlIsValid:Boolean = (event.type == ValidationResultEvent.VALID);
-				
+							
 				formIsValid = formIsValid && currentControlIsValid;
 				
 				return currentControlIsValid;
 			}
-		   	
         ]]>
     </mx:Script>
     
Index: lams_flash/src/central/flex/VideoRecorder/src/HTTPServices.as
===================================================================
diff -u -r61df3f3f473a3619f93c63ceb879ae36438020e8 -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82
--- lams_flash/src/central/flex/VideoRecorder/src/HTTPServices.as	(.../HTTPServices.as)	(revision 61df3f3f473a3619f93c63ceb879ae36438020e8)
+++ lams_flash/src/central/flex/VideoRecorder/src/HTTPServices.as	(.../HTTPServices.as)	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
@@ -1,4 +1,7 @@
 // creates an httpservice and gets video recordings
+import mx.graphics.codec.JPEGEncoder;
+import mx.utils.Base64Encoder;
+
 private function getRecordingsFromServer(sortBy:String, sortDirection:String):void{
 	// show an overlay over the video listings
 	LamsAjaxOverlayManager.showOverlay(videoList);
@@ -68,8 +71,9 @@
 		videoRecorderActions.request.isJustSound = false;
 	
 	videoRecorderActions.request.toolContentId = -1;
-	videoRecorderActions.request.saveToLams = false;
 	
+	videoRecorderActions.request.isLocal = false;
+	
 	videoRecorderActions.request.toolSessionId = toolSessionId;
 	videoRecorderActions.addEventListener(ResultEvent.RESULT, saveRecordingSuccessHandler);
 	videoRecorderActions.addEventListener(FaultEvent.FAULT, saveRecordingFaultHandler);
@@ -120,7 +124,7 @@
 	getRecordingsFromServer(sortButtonGroup.sortBy, sortButtonGroup.sortDirection);	
 	
 	// scroll the video information box to the position of the "Comments:" label
-	videoInformation.verticalScrollPosition = videoInformation.addCommentButton.y;
+	videoInformation.verticalScrollPosition = videoInformation.verticalPageScrollSize;
 	
 	// hide the overlay
   	LamsAjaxOverlayManager.hideOverlay(videoInformation);
@@ -217,4 +221,47 @@
 // fault handler for detele recording
   private function deleteRecordingFaultHandler(e:FaultEvent):void {
   	Alert.show(e.toString());
+}
+
+// attempts to save a preview image to the content folder
+private function savePreviewImage(filename:String, ext:String, image:BitmapData, toolSessionId:int):void{
+	var videoRecorderActions:HTTPService  = new HTTPService();
+	videoRecorderActions.url = servletUrl;
+	videoRecorderActions.method = "POST";
+	videoRecorderActions.resultFormat = "e4x";
+
+	videoRecorderActions.request.method = "saveImage";
+
+	videoRecorderActions.addEventListener(ResultEvent.RESULT, savePreviewImageSuccessHandler);
+	videoRecorderActions.addEventListener(FaultEvent.FAULT, savePreviewImageFaultHandler);
+				
+	var rawBytes:ByteArray = new ByteArray();
+	
+	if(ext == "png"){
+		var pngEncoder:PNGEncoder = new PNGEncoder();
+		rawBytes = pngEncoder.encode(image);
+	}
+	else if(ext == "jpg"){
+		var jpegEncoder:JPEGEncoder = new JPEGEncoder();
+		rawBytes = jpegEncoder.encode(image);	
+	}
+	
+	var encoder:Base64Encoder = new Base64Encoder(); 
+   	encoder.encodeBytes(rawBytes); 
+   	
+   	videoRecorderActions.request.filename = filename;
+	videoRecorderActions.request.ext = ext;
+	videoRecorderActions.request.toolSessionId = toolSessionId;
+	videoRecorderActions.request.data = encoder.flush();
+				
+	videoRecorderActions.send();
+}
+
+// handler for successful save preview image
+private function savePreviewImageSuccessHandler(e:ResultEvent):void {
+}
+
+// fault handler for save preview image
+  private function savePreviewImageFaultHandler(e:FaultEvent):void {
+  	Alert.show(e.toString());
 }
\ No newline at end of file
Index: lams_flash/src/central/flex/VideoRecorder/src/VideoInformation.mxml
===================================================================
diff -u -r42aa5319fbd33938828764c43dd0ab1ca80e2416 -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82
--- lams_flash/src/central/flex/VideoRecorder/src/VideoInformation.mxml	(.../VideoInformation.mxml)	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
+++ lams_flash/src/central/flex/VideoRecorder/src/VideoInformation.mxml	(.../VideoInformation.mxml)	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
@@ -87,8 +87,6 @@
 			<mx:Label id="descriptionLabel" text="Description:" fontStyle="italic"/>
 			<ns1:ResizeableTextArea id="description" width="100%" wordWrap="true" editable="false" verticalScrollPolicy="off" borderStyle="none"/>
 		</mx:VBox>
-		<mx:VBox width="100%" height="100%">
-		</mx:VBox>
 		<mx:VBox width="100%" id="commentsBox">
 			<mx:HRule width="100%" id="commentsRule"/>
 			<mx:Label id="commentsLabel" text="Comments:" fontStyle="italic"/>
Index: lams_flash/src/central/flex/VideoRecorder/src/VideoProfile.mxml
===================================================================
diff -u -r61df3f3f473a3619f93c63ceb879ae36438020e8 -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82
--- lams_flash/src/central/flex/VideoRecorder/src/VideoProfile.mxml	(.../VideoProfile.mxml)	(revision 61df3f3f473a3619f93c63ceb879ae36438020e8)
+++ lams_flash/src/central/flex/VideoRecorder/src/VideoProfile.mxml	(.../VideoProfile.mxml)	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
@@ -70,10 +70,10 @@
 					event.stopImmediatePropagation();
 					
 					if(dictionary){
-						Alert.show(dictionary.getLabel("videorecorder.message.sure.delete"), dictionary.getLabel("videorecorder.confirm"), 3, this, confirmDeleteClick);  
+						Alert.show(dictionary.getLabel("videorecorder.message.sure.delete"), dictionary.getLabel("videorecorder.confirm"), 3, Sprite(Application.application), confirmDeleteClick);  
 					}
 					else{
-						Alert.show("videorecorder.message.sure.delete", "videorecorder.confirm", 3, this, confirmDeleteClick);  
+						Alert.show("videorecorder.message.sure.delete", "videorecorder.confirm", 3, Sprite(Application.application), confirmDeleteClick);  
 					}
 				}
 			}
Index: lams_flash/src/central/flex/VideoRecorder/src/VideoRecorder.mxml
===================================================================
diff -u -r61df3f3f473a3619f93c63ceb879ae36438020e8 -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82
--- lams_flash/src/central/flex/VideoRecorder/src/VideoRecorder.mxml	(.../VideoRecorder.mxml)	(revision 61df3f3f473a3619f93c63ceb879ae36438020e8)
+++ lams_flash/src/central/flex/VideoRecorder/src/VideoRecorder.mxml	(.../VideoRecorder.mxml)	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml" layout="absolute" width="100%" backgroundGradientAlphas="[1.0, 1.0]" backgroundGradientColors="[#FFFFFF, #FFFFFF]" xmlns:ns1="org.lamsfoundation.lams.common.ui.components.*" xmlns:controls="com.asfusion.controls.*" height="100%" applicationComplete="onApplicationComplete(event)"  preinitialize="onPreinitialize(event)" enabled="true" xmlns:local="*" xmlns:ns2="org.lamsfoundation.lams.common.ui.components.*">
+<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml" 
+	xmlns:commonComponents="org.lamsfoundation.lams.common.ui.components.*"
+	xmlns:controls="com.asfusion.controls.*"
+	xmlns:local="*"
+	enabled="false" layout="absolute" width="100%" height="100%" backgroundGradientAlphas="[1.0, 1.0]" backgroundGradientColors="[#FFFFFF, #FFFFFF]"
+	applicationComplete="onApplicationComplete(event)" 
+	preinitialize="onPreinitialize(event)">
 	
 	<mx:Script>
 		<![CDATA[
+			import org.lamsfoundation.lams.common.util.ScreenShotterEvent;
 			//includes
 			include "HTTPServices.as"
 			
@@ -34,7 +41,7 @@
 			import mx.events.ListEvent;
 			import mx.managers.PopUpManager;
 			import org.lamsfoundation.lams.common.dictionary.XMLDictionary;
-			
+
 			// connection-related
 			private var nc:NetConnection;
 			private var client:Object;
@@ -61,13 +68,14 @@
 			[Bindable] private var servletUrl:String;
 			[Bindable] private var languageXML:XML;
 			[Bindable] private var mode:String;
+			[Bindable] private var contentFolderUrl:String;
 
 			// misc
-			private var filename:String = "";
 			[Bindable] private var itemClicked:Object = null;
-			private var ratingClicked:Rating;
 			[Bindable] private var dictionary:XMLDictionary;
 			[Bindable] private var videoRecordings:XMLList = null;
+			private var filename:String = "";
+			private var ratingClicked:Rating;
 			private var playTimer:Timer;
 			private var recLabelTimer:Timer;
 			private var metadata:Object;
@@ -121,23 +129,6 @@
 					serverUrl = "http://172.20.100.220:8080/lams/";
 					mode = AUTHOR_MODE;
 				}
-								
-				/*
-				Alert.show(
-					"contentEditable: " + contentEditable +
-					"\nuserId: " + userId +
-					"\ntoolSessionId: " + toolSessionId +
-					"\ntoolContentId: " + toolContentId +
-					"\nallowUseVoice: " + allowUseVoice +
-					"\nallowUseCamera: " + allowUseCamera +
-					"\nallowLearnerVideoVisibility: " + allowLearnerVideoVisibility +
-					"\nallowLearnerVideoExport: " + allowLearnerVideoExport +
-					"\nallowComments: " + allowComments +
-					"\nallowRatings: " + allowRatings +
-					"\nred5ServerUrl: " + red5ServerUrl +
-					"\nserverUrl: " + serverUrl +
-					"\nmode: " + mode);
-				*/
 			}
 			
 			// called from applicationComplete
@@ -169,8 +160,8 @@
 				videoDisplay.servletUrl = servletUrl;
 				
 				// if the cam is to be used, set that up
-				if(allowUseCamera){
-					cam = VideoDisplayUtil.setupCamera();
+				cam = VideoDisplayUtil.setupCamera();
+				if(allowUseCamera && cam){
 					videoDisplay.attachCamera(cam);
 				}
 				// else remove the view camera button
@@ -179,26 +170,26 @@
 				}
 				
 				// if the mic is to be used, set that up
-				if(allowUseVoice){
-					mic = VideoDisplayUtil.setupMic();
-					videoDisplay.attachMic(mic)
+				mic = VideoDisplayUtil.setupMic();
+				if(allowUseVoice && mic){
+					videoDisplay.attachMic(mic);
 				}
 				
 				// if neither mic or camera are to be used
-				if(!allowUseCamera && !allowUseVoice){
+				if((!allowUseCamera && !allowUseVoice) || (!cam && !mic)){
 					// remove recording button
 					removeChild(getChildByName("recordingBox"));
 					
 					// stretch the video list
 					videoList.setStyle("bottom", 10);
 					videoList.invalidateList();
 				}
-				else{
-					if(!isWebcamInfoSet())
-					{
-						Security.showSettings();
-						setWebcamInfo(true);
-					}
+				
+				// if first time using video recorder, pop flash settings
+				if(!isWebcamInfoSet())
+				{
+					Security.showSettings();
+					setWebcamInfo(true);
 				}
 				
 				// init components that need it
@@ -236,6 +227,7 @@
 				allowRatings = LAMSStringUtil.stringToBool(Application.application.parameters.allowRatings);
 				languageXML = XML(Application.application.parameters.languageXML);
 				mode = Application.application.parameters.mode;
+				contentFolderUrl = Application.application.parameters.contentFolderUrl;
 			}
 			
 			// sets initial labels
@@ -314,6 +306,8 @@
 				videoDisplay.addEventListener(VideoDisplayEvent.READYSEEK, onReadySeek);
 				seekSlider.addEventListener(SliderEvent.THUMB_PRESS, onSeekPress);
 				seekSlider.addEventListener(SliderEvent.THUMB_RELEASE, onSeekRelease);
+				
+				this.addEventListener(ScreenShotterEvent.SCREENSHOTTAKEN, onScreenShotTaken);
 			}
 			
 			// checks for previous webcam info
@@ -361,10 +355,7 @@
 			private function ncStatusHandler(event:NetStatusEvent):void {
 				// get the info object
 				var infoObject:Object = event.info;
-				
-				// print its properties
-  				//DebugPopUp.getInstance().log(VideoDisplayUtil.printInfoObject(infoObject), DebugPopUp.DEBUG);
-  				
+				  				
 				// if successful connection
 				if (infoObject.code == "NetConnection.Connect.Success") {
 					// enable application
@@ -445,10 +436,7 @@
 			
 			// view camera click handler
 			private function viewCameraClick(event:MouseEvent):void{
-				if(!videoDisplay.isCameraViewed){
-					// reset the video display
-					videoDisplay.reset();
-					
+				if(!videoDisplay.isCameraViewed){					
 					// reset the seek slider timer
 					seekSlider.resetTimerLabel();
 					
@@ -520,7 +508,6 @@
 						videoInformation.enableVideoInformationButtons(false);
 					}
 					
-				
 					// scroll the video information box back up to top
 					videoInformation.verticalScrollPosition = 0;
 					
@@ -555,7 +542,7 @@
 						videoInformation.ratingButton.toolTip = dictionary.getLabelAndConcatenate("videorecorder.tooltip.already.rated", [" ", String(itemClicked.userRating)]);
 					}
 					
-					// make ready item clickedo
+					// make ready
 					makeReadytItemClicked();
 				}
 				else{
@@ -566,13 +553,25 @@
 			
 			// makes the clicked item ready with the video display
 			private function makeReadytItemClicked():void{
+				// correct filename if needed
+				var filename;
+				
+				// is local
+				var isLocal = LAMSStringUtil.stringToBool(itemClicked.isLocal);
+							
+				if(isLocal){
+					filename = contentFolderUrl + itemClicked.filename;
+				}else{
+					filename = itemClicked.filename;
+				}
+							
 				// if playing a sound file
 				if(LAMSStringUtil.stringToBool(itemClicked.isJustSound)){
 					// change the view stack to audio view
-					videoDisplay.makeReadyAudio(itemClicked.filename);
+					videoDisplay.makeReady(filename, "audio", isLocal);
 				}else{
 					// change the view stack to player view
-					videoDisplay.makeReadyVideo(itemClicked.filename);
+					videoDisplay.makeReady(filename, "video", isLocal);
 				}
 			}
 			
@@ -757,7 +756,15 @@
 				enablePlaybackButtons(false);
 				seekSlider.enable(false);
 			}
-									   	       	
+						
+			// onScreenShotTaken callback, called from screenShotter in videoDisplay
+			private function onScreenShotTaken(event:ScreenShotterEvent):void{
+				var previewImage:BitmapData = event.previewImage;
+			
+				// call the service
+				savePreviewImage(filename, "jpg", previewImage, toolSessionId);
+			}
+						   	       	
 	        // enables/disables the playback related buttons
 	        private function enablePlaybackButtons(enabled:Boolean):void{
 	        	var trueEnable:Boolean = enabled && itemClicked != null;
@@ -855,32 +862,32 @@
 	</mx:Script>
 
 	<mx:Panel width="340" height="310" layout="absolute" left="10" top="10" title="Display:" id="videoRecorderPanel" borderColor="#E2E2E2">
-	<ns1:VideoDisplay id="videoDisplay" width="320" height="240"/>
+	<commonComponents:VideoDisplay id="videoDisplay" width="320" height="240"/>
 	<mx:ControlBar height="38" y="242">
 		<mx:Button id="playButton" label="Play" width="75" textAlign="left" fontSize="10" paddingRight="0" paddingLeft="2"/>
-		<ns1:SeekSlider id="seekSlider" videoDisplay="{videoDisplay}" width="100%"/>
+		<commonComponents:SeekSlider id="seekSlider" videoDisplay="{videoDisplay}" width="100%"/>
 	</mx:ControlBar>
 	</mx:Panel>
 	<mx:Label id="videoInformationLabel" text="Video information:" fontWeight="bold" top="328" left="10"/>
-	<local:VideoInformation id="videoInformation" allowComments="{allowComments}" allowRatings="{allowRatings}" dictionary="{dictionary}" backgroundDisabledColor="#FFFFFF" cornerRadius="5" bottom="10" top="354" left="10" width="340"/>
+	<local:VideoInformation id="videoInformation" allowComments="{allowComments}" allowRatings="{allowRatings}" dictionary="{dictionary}" backgroundDisabledColor="#FFFFFF" cornerRadius="5" bottom="10" top="354" left="10" width="340" horizontalScrollPolicy="off" verticalScrollPolicy="on"/>
 	<mx:HBox left="358" top="10" right="10">
 		<mx:Label id="videosLabel" text="Videos:" fontWeight="bold"/>
 	</mx:HBox>
-	<mx:TileList borderStyle="solid" id="videoList" itemRenderer="{new ArgumentsToRendererFactory({userId:this.userId, allowLearnerVideoExport:this.allowLearnerVideoExport, allowLearnerVideoVisibility:this.allowLearnerVideoVisibility, mode:this.mode, dictionary:this.dictionary, contentEditable: this.contentEditable},VideoProfile)}" dataProvider="{videoRecordings}" paddingLeft="0" paddingRight="0" paddingTop="0" paddingBottom="0" itemClick="videoListClick(event)" top="62" left="358" bottom="70" cornerRadius="5" right="10"></mx:TileList>
+	<mx:TileList borderStyle="solid" id="videoList" itemRenderer="{new ArgumentsToRendererFactory({userId:this.userId, allowLearnerVideoExport:this.allowLearnerVideoExport, allowLearnerVideoVisibility:this.allowLearnerVideoVisibility, mode:this.mode, dictionary:this.dictionary, contentEditable: this.contentEditable},VideoProfile)}" dataProvider="{videoRecordings}" paddingLeft="0" paddingRight="0" paddingTop="0" paddingBottom="0" itemClick="videoListClick(event)" top="62" left="358" bottom="63" cornerRadius="5" right="10"></mx:TileList>
 	<mx:HBox verticalAlign="middle" left="358" top="36" right="10">
 		<mx:Label id="sortByLabel" text="Sort by:" fontWeight="normal" fontStyle="normal"/>
-		<ns2:SortButtonGroup width="100%" horizontalGap="3" id="sortButtonGroup">
-			<ns2:SortButton id="sortDateButton" label="Date"  sortBy="date" selected="true" horizontalGap="0" sortDirection="descending"/>
-			<ns2:SortButton id="sortAuthorButton" label="Author"  sortBy="author" horizontalGap="0"/>
-			<ns2:SortButton id="sortTitleButton" label="Title"  sortBy="title" horizontalGap="0"/>
-		</ns2:SortButtonGroup>
+		<commonComponents:SortButtonGroup width="100%" horizontalGap="3" id="sortButtonGroup">
+			<commonComponents:SortButton id="sortDateButton" label="Date"  sortBy="date" selected="true" horizontalGap="0" sortDirection="descending"/>
+			<commonComponents:SortButton id="sortAuthorButton" label="Author"  sortBy="author" horizontalGap="0"/>
+			<commonComponents:SortButton id="sortTitleButton" label="Title"  sortBy="title" horizontalGap="0"/>
+		</commonComponents:SortButtonGroup>
 		<mx:Button label="Update" id="refreshButton" click="getRecordingsFromServer(sortButtonGroup.sortBy, sortButtonGroup.sortDirection)" height="17" textAlign="center"/>
 	</mx:HBox>
-	<mx:VBox height="52" horizontalAlign="right" right="10" bottom="10" left="357" id="recordingBox">
+	<mx:VBox horizontalAlign="right" right="10" bottom="10" left="357" id="recordingBox" verticalGap="5">
 		<mx:Label id="recordingControlsLabel" text="Recording controls:" fontWeight="bold"/>
-		<mx:HBox width="100%" height="100%" horizontalAlign="right"  id="recordingButtonBox">
+		<mx:HBox width="100%" horizontalAlign="right"  id="recordingButtonBox">
 			<mx:Button id="viewCameraButton" label="View Camera"/>
 			<mx:Button fontWeight="bold" id="startRecButton" label="Start Recording"/>
 		</mx:HBox>
 	</mx:VBox>
-</mx:Application>
+</mx:Application>
\ No newline at end of file
Index: lams_flash/src/central/flex/VideoRecorderFCKEditor/src/HTTPServices.as
===================================================================
diff -u -r42aa5319fbd33938828764c43dd0ab1ca80e2416 -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82
--- lams_flash/src/central/flex/VideoRecorderFCKEditor/src/HTTPServices.as	(.../HTTPServices.as)	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
+++ lams_flash/src/central/flex/VideoRecorderFCKEditor/src/HTTPServices.as	(.../HTTPServices.as)	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
@@ -1,7 +1,11 @@
 // creates an httpservice and saves a video recording
+import mx.controls.Alert;
+import mx.graphics.codec.JPEGEncoder;
+import mx.graphics.codec.PNGEncoder;
 import mx.rpc.events.FaultEvent;
 import mx.rpc.events.ResultEvent;
 import mx.rpc.http.HTTPService;
+import mx.utils.Base64Encoder;
 
 private function saveRecordingToServer(title:String, description:String, filename:String, toolContentId:int):void{
 	var videoRecorderActions:HTTPService  = new HTTPService();
@@ -14,7 +18,7 @@
 	videoRecorderActions.request.filename = filename;
 	videoRecorderActions.request.toolContentId = toolContentId;
 	
-	videoRecorderActions.request.saveToLams = false;
+	videoRecorderActions.request.isLocal = true;
 	videoRecorderActions.request.isJustSound = false;
 	videoRecorderActions.request.userId = -1;
 	videoRecorderActions.request.toolSessionId = -1;
@@ -32,8 +36,8 @@
 	// alert complete
 	Alert.show(dictionary.getLabel("videorecorder.recording.complete.authoring"));
 	
-	// change the start recording button's label
-	videoDisplay.makeReadyVideo(filename);
+	// make the movie ready
+	videoDisplay.makeReady(filename, "video", offlinePlayback);
 	
 	// update tooltip
 	videoControlBar.recordButton.toolTip = dictionary.getLabel("videorecorder.tooltip.start.recording.again");
@@ -98,3 +102,45 @@
 	Alert.show(e.toString());
 }
 
+// attempts to save a preview image to the content folder
+private function savePreviewImage(dir:String, filename:String, ext:String, image:BitmapData):void{
+	var videoRecorderActions:HTTPService  = new HTTPService();
+	videoRecorderActions.url = toolServletUrl;
+	videoRecorderActions.method = "POST";
+	videoRecorderActions.resultFormat = "e4x";
+
+	videoRecorderActions.request.method = "saveImage";
+
+	videoRecorderActions.addEventListener(ResultEvent.RESULT, savePreviewImageSuccessHandler);
+	videoRecorderActions.addEventListener(FaultEvent.FAULT, savePreviewImageFaultHandler);
+				
+	var rawBytes:ByteArray = new ByteArray();
+	
+	if(ext == "png"){
+		var pngEncoder:PNGEncoder = new PNGEncoder();
+		rawBytes = pngEncoder.encode(image);
+	}
+	else if(ext == "jpg"){
+		var jpegEncoder:JPEGEncoder = new JPEGEncoder();
+		rawBytes = jpegEncoder.encode(image);	
+	}
+	
+	var encoder:Base64Encoder = new Base64Encoder(); 
+   	encoder.encodeBytes(rawBytes); 
+   	
+	videoRecorderActions.request.dir = dir;
+   	videoRecorderActions.request.filename = filename;
+	videoRecorderActions.request.ext = ext;
+	videoRecorderActions.request.data = encoder.flush();
+				
+	videoRecorderActions.send();
+}
+
+// handler for successful save preview image
+private function savePreviewImageSuccessHandler(e:ResultEvent):void {
+}
+
+// fault handler for save preview image
+  private function savePreviewImageFaultHandler(e:FaultEvent):void {
+  	Alert.show(e.toString());
+}
\ No newline at end of file
Index: lams_flash/src/central/flex/VideoRecorderFCKEditor/src/VideoRecorderFCKEditor.mxml
===================================================================
diff -u -r61df3f3f473a3619f93c63ceb879ae36438020e8 -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82
--- lams_flash/src/central/flex/VideoRecorderFCKEditor/src/VideoRecorderFCKEditor.mxml	(.../VideoRecorderFCKEditor.mxml)	(revision 61df3f3f473a3619f93c63ceb879ae36438020e8)
+++ lams_flash/src/central/flex/VideoRecorderFCKEditor/src/VideoRecorderFCKEditor.mxml	(.../VideoRecorderFCKEditor.mxml)	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
@@ -1,9 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml" layout="absolute" xmlns:ns1="org.lamsfoundation.lams.common.ui.components.*" backgroundGradientAlphas="[1.0, 1.0]" backgroundGradientColors="[#FFFFFF, #FFFFFF]" width="361" height="331" preinitialize="onPreinitialize(event)" applicationComplete="onApplicationComplete(event)" xmlns:ns2="*">
-
+<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml"
+	xmlns:ns1="org.lamsfoundation.lams.common.ui.components.*"
+	xmlns:ns2="*"
+	layout="absolute" 	backgroundGradientAlphas="[1.0, 1.0]" backgroundGradientColors="[#FFFFFF, #FFFFFF]" width="361" height="331"
+	enabled="false"
+	preinitialize="onPreinitialize(event)"
+	applicationComplete="onApplicationComplete(event)">
+		
 	<mx:Script>
 		<![CDATA[
-			
+			import org.lamsfoundation.lams.common.conn.ImageService;
+			import org.lamsfoundation.lams.common.util.ScreenShotterEvent;
+						
 			//includes
 			include "HTTPServices.as"
 			
@@ -26,6 +34,7 @@
 			
 			// flashvars
 			[Bindable] private var mode:String;
+			private var offlinePlayback:Boolean;
 			private var red5ServerUrl:String;
 			private var red5RecordingsUrl:String;
 			private var saveToLamsDestUrl:String;
@@ -51,8 +60,10 @@
 			
 			// static strings
 			private static var red5App:String = "oflaDemo";
-			private static var toolServletLocation:String = "tool/lavidr10/videoRecorderActions.do";
+			private static var toolWWWDir:String = "tool/lavidr10/";
+			private static var toolServletLocation:String = "videoRecorderActions.do";
 			private static var saveToLamsServletLocation:String = "GetRecording";
+			private static var flvExtension:String = ".flv";
 			
 			// icon embeds
 			[Embed(source="../../../../../../lams_central/web/images/icons/control_play.png")] [Bindable] private var playIcon:Class;
@@ -118,7 +129,7 @@
 				red5ServerUrl += red5App;
 				
 				// add the tool servlet location
-				toolServletUrl = serverUrl + toolServletLocation;
+				toolServletUrl = serverUrl + toolWWWDir + toolServletLocation;
 				
 				// add the save to lams servlet location
 				saveToLamsServletUrl = serverUrl + saveToLamsServletLocation;
@@ -129,18 +140,27 @@
 								
 				// swtich on mode
 				switch(mode){
+					/*
+					In playerModeOnline mode, the parameters passed via flashVars are used to create a connection to a given Red5 server.
+					Video is streamed from that server to the user.
+					*/
 					case "playerModeOnline":{
 						createConnection();
 						break;
 					}
-
+					/*
+					In playerModeOffline mode, a null NetConnection object is used to play local video from the disk.
+					*/
 					case "playerModeOffline":{
-						var nc:NetConnection = new NetConnection();
-						nc.connect(null);
-						videoDisplay.setNetConnection(nc);
-						videoDisplay.makeReadyVideo(filename);
+						Application.application.enabled = true;
+						videoDisplay.makeReady(filename, "video", true);
 						break;
 					}
+					/*
+					In recorderModeFCK mode, a NetConnection is created to the given Red5 server. Video is streamed and recorded
+					on this server. It is then copied back to the LAMS server in the lesson's content folder for local reading
+					much like an attachment is added to the FCKEditor.
+					*/
 					case "recorderModeFCK":{
 						toolContentId = -1;
 						
@@ -152,11 +172,27 @@
 						
 						cam = VideoDisplayUtil.setupCamera();
 						mic = VideoDisplayUtil.setupMic();
-						videoDisplay.attachCamera(cam);
-						videoDisplay.attachMic(mic);
+						
+						if(cam){
+							videoDisplay.attachCamera(cam);
+						}
+
+						if(mic){
+							videoDisplay.attachMic(mic);
+						}
+						
+						if(!mic && !cam){
+							videoControlBar.recordButton.enabled = false;
+						}
+						
 						createConnection();
 						break;
 					}
+					/*
+					In recorderModeAuthor mode, a NetConnection is created to the given Red5 server. Video is streamed and recorded
+					on this server. It is then used in a VideoRecorder tool session. After it is recorded, it is immediately transfered back to
+					the LAMS server in case the lesson is exported.
+					*/
 					case "recorderModeAuthor":{
 						userId = -1;
 						
@@ -168,8 +204,19 @@
 						
 						cam = VideoDisplayUtil.setupCamera();
 						mic = VideoDisplayUtil.setupMic();
-						videoDisplay.attachCamera(cam);
-						videoDisplay.attachMic(mic);
+						
+						if(cam){
+							videoDisplay.attachCamera(cam);
+						}
+
+						if(mic){
+							videoDisplay.attachMic(mic);
+						}
+						
+						if(!mic && !cam){
+							videoControlBar.recordButton.enabled = false;
+						}
+						
 						createConnection();
 
 						break;
@@ -204,6 +251,7 @@
 				videoDisplay.addEventListener(VideoDisplayEvent.STOPPUBLISH, onStopPublish);
 				videoDisplay.addEventListener(VideoDisplayEvent.PAUSESEEK, onPauseSeek);
 				videoDisplay.addEventListener(VideoDisplayEvent.READYSEEK, onReadySeek);	
+				this.addEventListener(ScreenShotterEvent.SCREENSHOTTAKEN, onScreenShotTaken);
 				
 				videoControlBar.playButton.addEventListener(MouseEvent.CLICK, playClick);
 				
@@ -269,11 +317,12 @@
 			
 			// gets flashvars
 			private function getFlashVars():void{
+				mode = Application.application.parameters.mode;
+				offlinePlayback = LAMSStringUtil.stringToBool(Application.application.parameters.offlinePlayback);
 				red5ServerUrl = Application.application.parameters.red5ServerUrl;
 				serverUrl = Application.application.parameters.serverUrl;
 				filename = Application.application.parameters.filename;
 				languageXML = XML(Application.application.parameters.languageXML);
-				mode = Application.application.parameters.mode;
 				toolContentId = Application.application.parameters.toolContentId;
 				userId = Application.application.parameters.userId;
 				red5RecordingsUrl = Application.application.parameters.red5RecordingsUrl;
@@ -329,18 +378,28 @@
 					// enable application
 					Application.application.enabled = true;
 					
-					// if we are in a player instance
-					if(mode == "playerModeOffline" || mode == "playerModeOnline"){
-						videoDisplay.makeReadyVideo(filename);
+					// if we are in a player online instance
+					if(mode == "playerModeOnline"){
+						// extension added from fck record
+						videoDisplay.makeReady(filename, "video", false);
 					}
-					// if we are in fck mode or if we are in recorder mode AND have no input filename
-					else if(mode == "recorderModeFCK" || (mode == "recorderModeAuthor" && filename == "")){
+					// if we are in fck mode
+					else if(mode == "recorderModeFCK"){
 						videoDisplay.startViewCamera();
 					}
+					// if we are in recorder mode and have no input filename
+					else if(mode == "recorderModeAuthor" && filename == flvExtension){
+						videoDisplay.startViewCamera();
+					}
 					// if we are in author mode and are given a filename, don't start camera, play recording instead
-					else if(mode == "recorderModeAuthor" && filename != ""){					
+					else if(mode == "recorderModeAuthor" && filename != flvExtension){
+						// add on to the filename if offlinePlayback is active
+						if(offlinePlayback){
+							filename = contentFolderUrl + filename;
+						}
+						
 						// change the start recording button's label
-						videoDisplay.makeReadyVideo(filename);
+						videoDisplay.makeReady(filename, "video", offlinePlayback);
 						
 						// update tooltip
 						videoControlBar.recordButton.toolTip = dictionary.getLabel("videorecorder.tooltip.start.recording.again");
@@ -494,12 +553,15 @@
 			
 			// onStopPublish callback, called from videoDisplay
 			private function onStopPublish(event:VideoDisplayEvent):void{
-				if(mode == "recorderModeFCK"){
+				// no matter what, the video just recorded is now on the server
+				offlinePlayback = false;
+				
+				if(mode == "recorderModeFCK"){											
 					// alert complete
 					Alert.show(dictionary.getLabel("videorecorder.recording.complete.fck"));
 					
-					// change the start recording button's label
-					videoDisplay.makeReadyVideo(filename);
+					// play the movie from the Red5 server
+					videoDisplay.makeReady(filename, "video", offlinePlayback);
 					
 					// change the panel status
 					videoDisplayPanel.status = dictionary.getLabel("videorecorder.ready");
@@ -510,18 +572,18 @@
 					// enable saving and closing
 					videoControlBar.saveAndCloseButton.enabled = true;
 					videoControlBar.saveAndCloseButton.toolTip = dictionary.getLabel("videorecorder.tooltip.save.recording");
-					
-					// copy recording to lams server
-					copyRecordingToLamsServer(red5RecordingsUrl + filename + ".flv", lamsEarDir + saveToLamsDestUrl, filename + ".flv");
 				}
-				else if(mode == "recorderModeAuthor"){
+				else if(mode == "recorderModeAuthor"){							
 					// get the details needed
 					getDetailsPopUp = GetRecordingDetailsPopUp(PopUpManager.createPopUp(this, GetRecordingDetailsPopUp, true));
 					PopUpManager.centerPopUp(getDetailsPopUp);
 					getDetailsPopUp.init(dictionary);
 					getDetailsPopUp.addEventListener("popUpClose", popUpRemovedHandler);
 				}
 				
+				// copy recording to lams server
+				copyRecordingToLamsServer(red5RecordingsUrl + filename + ".flv", lamsEarDir + saveToLamsDestUrl, filename + ".flv");
+					
 				recTimer.stop();
 			}
 						
@@ -551,7 +613,18 @@
 				videoControlBar.seekSlider.enable(true);
 				videoDisplayPanel.status = dictionary.getLabel("videorecorder.ready");
 			}
-	
+			
+			// onScreenShotTaken callback, called from screenShotter in videoDisplay
+			private function onScreenShotTaken(event:ScreenShotterEvent):void{
+				// only save screenshot if in author mode
+				if(mode == "recorderModeAuthor"){
+					// get the preview image
+					var previewImage:BitmapData = event.previewImage;
+					
+					// call the service
+					savePreviewImage(lamsEarDir + saveToLamsDestUrl, filename, "jpg", previewImage);
+				}
+			}
 		]]>
 	</mx:Script>
 	<mx:Panel x="10" y="10" width="340" height="310" layout="absolute" id="videoDisplayPanel">
Index: lams_flash/src/common/flex/org/lamsfoundation/lams/common/ui/components/VideoDisplay.mxml
===================================================================
diff -u -r0bbad8932a51efb88ac79f78bf2c7d7396554fe9 -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82
--- lams_flash/src/common/flex/org/lamsfoundation/lams/common/ui/components/VideoDisplay.mxml	(.../VideoDisplay.mxml)	(revision 0bbad8932a51efb88ac79f78bf2c7d7396554fe9)
+++ lams_flash/src/common/flex/org/lamsfoundation/lams/common/ui/components/VideoDisplay.mxml	(.../VideoDisplay.mxml)	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
@@ -41,6 +41,7 @@
 			private var _ns:NetStream;
 			private var _metadata:Object;
 			private var _nc:NetConnection;
+			private var _ncOffline:NetConnection;
 			private var _serverUrl:String;
 			private var _servletUrl:String;
 			private var _filename:String;
@@ -67,12 +68,16 @@
 				// fix video player
 				player.addChild(video);
 				video.visible = true;		
-								
+				
+				// create offline netconnection
+				_ncOffline = new NetConnection();
+				_ncOffline.connect(null);
+				
 				// create screenshotters
 				screenshotter = new NetStreamScreenShotter();
 				
 				// add listeners for screenshots
-				screenshotter.addEventListener(ScreenShotterEvent.SCREENSHOTTAKEN, screenShotTaken);
+				//screenshotter.addEventListener(ScreenShotterEvent.SCREENSHOTTAKEN, screenShotTaken);
 				
 				// reset to make sure everything is set to default
 				reset();
@@ -95,6 +100,11 @@
 				screenshotter.nc = nc;
 			}
 			
+			// sets a buffer time (optional)
+			public function setBufferTime(bufferTime:int):void{
+				_bufferTime = bufferTime;
+			}
+			
 			// playMode getter
 			public function get playMode():int{
 				return _playMode;
@@ -127,38 +137,28 @@
 			}
 			
 			// prepares the player to receive a video
-			public function makeReadyVideo(filename:String):void{
+			public function makeReady(filename:String, type:String, offline:Boolean):void{
 				// reset the current ns
-				reset();
+				reset(offline);
 				
 				// reduce volume temporarily
 				_ns.soundTransform = new SoundTransform(0);
 				
 				// change the view
-				selectedChild = playerView;
+				if(type == "audio"){
+					selectedChild = audioView;
+				}
+				else{
+					selectedChild = playerView;
+				}
 				
 				// save filename
 				_filename = filename;
 								
 				// play
 				_ns.play(_filename);
 			}
-			
-			// prepares the player to receive an audio file (aka video with no video)
-			public function makeReadyAudio(filename:String):void{
-				// reset the current ns
-				reset();
-								
-				// change the view
-				selectedChild = audioView;
-				
-				// save filename
-				_filename = filename;
-				
-				// play
-				_ns.play(_filename);
-			}
-			
+						
 			// like both above methods but uses old filename and view state
 			private function makeReadyAgain():void{
 				// seek the video the very beginning and pause
@@ -248,7 +248,7 @@
 			}
 			
 			// resets video
-			public function reset():void{
+			public function reset(isOffline:Boolean = false):void{
 				// change view to black
 				selectedChild = blackView;
 				
@@ -273,14 +273,15 @@
 					readyTimer.stop();
 					readyTimer = null;	
 				}
+				
 				// clear the video object
 				video.clear();
 				
 				// reset play buttons
 				_playMode = INIT_MODE;
 				
 				// create a new netstream
-				_ns = createNetStream();
+				_ns = createNetStream(isOffline);
 				
 				// attach the new ns
 				video.attachNetStream(_ns);
@@ -293,39 +294,48 @@
 			}
 			
 			// creates a new netstream object
-			private function createNetStream():NetStream{
-				// if nc is not null
-				if(_nc){
-					var ns:NetStream = new NetStream(_nc);
+			private function createNetStream(isOffline:Boolean = false):NetStream{
+				var ns:NetStream;
+				var client:Object;
+				
+				if((isOffline && !_ncOffline) || (isOffline && !_ncOffline)){
+					return null;
+				}
+				else if(isOffline && _ncOffline){
+					ns = new NetStream(_ncOffline);
 					ns.bufferTime = _bufferTime;
-					
-					// listeners and callback stuff for netstatus object
-					var client:Object = new Object();
-					client.onMetaData = onMetaData;
-					client.onPlayStatus = onPlayStatus;
-					ns.client = client;
-					
-					ns.addEventListener(AsyncErrorEvent.ASYNC_ERROR, asyncErrorHandler);
-					ns.addEventListener(NetStatusEvent.NET_STATUS, nsStatusHandler);
-					
-					// is camera is allowed, set that up
-					if(_cam){
-						ns.attachCamera(_cam);
-					}
-					
-					// if the mic is to be used, set that up
-					if(_mic){
-						ns.attachAudio(_mic);
-					}
-						
-					return ns;
+
 				}
-				else
+				else if(!isOffline && _nc){
+					ns = new NetStream(_nc);
+					ns.bufferTime = _bufferTime;
+				}
+				else{
 					return null;
+				}
+				
+				// listeners and callback stuff for netstatus object
+				client = new Object();
+				client.onMetaData = onMetaData;
+				client.onPlayStatus = onPlayStatus;
+				ns.client = client;
+				
+				ns.addEventListener(AsyncErrorEvent.ASYNC_ERROR, asyncErrorHandler);
+				ns.addEventListener(NetStatusEvent.NET_STATUS, nsStatusHandler);
+				
+				// is camera is allowed, set that up
+				if(_cam){
+					ns.attachCamera(_cam);
+				}
+				
+				// if the mic is to be used, set that up
+				if(_mic){
+					ns.attachAudio(_mic);
+				}
+					
+				return ns;
 			}
 
-
-			
 			// creates a new timer object
 			private function createTimer():Timer{
 				var timer:Timer = new Timer(10);
@@ -651,26 +661,9 @@
 			
 			// callback from screenshotter
 			private function screenShotTaken(event:ScreenShotterEvent):void{
-				// get the preview image
-				var previewImage:BitmapData = event.previewImage;
-				
-				// set up the service
-				var imageService:ImageService = new ImageService(_servletUrl, saveImageMethod);
-				imageService.addEventListener(ResultEvent.RESULT, savePreviewImageSuccessHandler);
-				imageService.addEventListener(FaultEvent.FAULT, savePreviewImageFaultHandler);
-				
-				// send to server
-				imageService.sendImageToServer(null, _filename, imageService.JPG_EXT, previewImage);
+				// pass on the event
+				dispatchEvent(event);
 			}
-			
-			// handler for successful save preview image
-			private function savePreviewImageSuccessHandler(e:ResultEvent):void {
-			}
-			
-			// fault handler for save preview image
-			  private function savePreviewImageFaultHandler(e:FaultEvent):void {
-			  	Alert.show(e.toString());
-			}
 	    ]]>
 	</mx:Script>
 	
Index: lams_flash/src/common/flex/org/lamsfoundation/lams/common/util/NetStreamScreenShotter.as
===================================================================
diff -u -r0bbad8932a51efb88ac79f78bf2c7d7396554fe9 -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82
--- lams_flash/src/common/flex/org/lamsfoundation/lams/common/util/NetStreamScreenShotter.as	(.../NetStreamScreenShotter.as)	(revision 0bbad8932a51efb88ac79f78bf2c7d7396554fe9)
+++ lams_flash/src/common/flex/org/lamsfoundation/lams/common/util/NetStreamScreenShotter.as	(.../NetStreamScreenShotter.as)	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
@@ -140,7 +140,7 @@
 			screenshotNs.close();
 			screenshotNs = null;
 			
-			var screenShotEvent:ScreenShotterEvent = new ScreenShotterEvent(ScreenShotterEvent.SCREENSHOTTAKEN);
+			var screenShotEvent:ScreenShotterEvent = new ScreenShotterEvent(ScreenShotterEvent.SCREENSHOTTAKEN, true, true);
 			screenShotEvent.previewImage = previewImage;
 			
 			dispatchEvent(screenShotEvent);
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/MultipleDirFileBundler.java
===================================================================
diff -u -r42aa5319fbd33938828764c43dd0ab1ca80e2416 -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82
--- lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/MultipleDirFileBundler.java	(.../MultipleDirFileBundler.java)	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/MultipleDirFileBundler.java	(.../MultipleDirFileBundler.java)	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
@@ -28,14 +28,14 @@
 	 * 
 	 * @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 srcDirs the locations of the files to copy
+	 * @param targetDirs the locations to store the files
 	 * @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
+	public void bundle(HttpServletRequest request, Cookie[] cookies, String[] srcDirs, String[] targetDirs, ArrayList<String>[] filenames) throws Exception
 	{
-		bundleViaHTTP(request, cookies, outputDirectory, fileUrlDir, filenames);
+		bundleViaHTTP(request, cookies, srcDirs, targetDirs, filenames);
 	}
 	
 	/**
@@ -50,20 +50,20 @@
 	 * @throws FileNotFoundException
 	 * @throws IOException
 	 */
-	private void bundleViaHTTP(HttpServletRequest request, Cookie[] cookies, String outputDirectory, String[] fileUrlDir, ArrayList<String>[] filenames) 
+	private void bundleViaHTTP(HttpServletRequest request, Cookie[] cookies, String[] srcDirs, String[] targetDirs, 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++){
+		// make the target directories
+		for(int i = 0; i < targetDirs.length; i++){
+			File fileDir = new File(targetDirs[i]);
+			fileDir.mkdirs();
+			
 			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);
+				String srcUrl = srcDirs[i] + filenameArray.get(j);
+				String targetDir = targetDirs[i];
+				HttpUrlConnectionUtil.writeResponseToFile(srcUrl, targetDir, filenameArray.get(j), cookies);
 			}
 		}
 	}
Index: lams_learning/web/includes/presence.css
===================================================================
diff -u -r0bbad8932a51efb88ac79f78bf2c7d7396554fe9 -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82
--- lams_learning/web/includes/presence.css	(.../presence.css)	(revision 0bbad8932a51efb88ac79f78bf2c7d7396554fe9)
+++ lams_learning/web/includes/presence.css	(.../presence.css)	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
@@ -1,10 +1,10 @@
 /*
 *************************************************
-LAMS 2.0
-Date modified:  22/09/2006
+LAMS 2.2
+Date modified:  29/04/2009
 
 *************************************************
-Presence style
+Presence stylesheet
 ********************************************** */
 
 #presenceUserListings {
@@ -20,6 +20,19 @@
 	z-index: 10;
 }
 
+#presenceChatWarning {
+	position: absolute;
+	width: 400px;
+	right: 18px;
+	z-index: 10;
+	padding: 10px 10px 10px 40px;
+	margin: 0;
+}
+
+.startHidden {
+	display: none;
+}
+
 #presenceChatTabs {
 	position: absolute;
 	bottom: 0;
@@ -47,16 +60,24 @@
 	top: 0px;
 	right:0px;
 }
-.presenceName {
+.presenceListing {
 	width:"100%";
 }
 
-.presenceName:hover {
+.presenceListing:hover {
 	width:"100%";
 	background-color: #CBDBFF;
 	cursor: pointer;
 }
 
+.presenceListingNewMessage {
+	background-color: #88FF99;
+}
+
+.presenceTabNewMessage {
+	text-decoration: underline;
+}
+
 .presenceMessage {
 	padding-bottom: 4px;
 }
Index: lams_learning/web/includes/presence.js
===================================================================
diff -u -r0bbad8932a51efb88ac79f78bf2c7d7396554fe9 -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82
--- lams_learning/web/includes/presence.js	(.../presence.js)	(revision 0bbad8932a51efb88ac79f78bf2c7d7396554fe9)
+++ lams_learning/web/includes/presence.js	(.../presence.js)	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
@@ -69,6 +69,8 @@
 		// set presence chat to minimized height
   		$("#presenceChat").css({'top': windowHeight + "px"});
 	}
+	
+	$("#presenceChatWarning").css({'top': windowHeight - 10 + "px"});
 }
  		
 function getUserFromTag(tag){
@@ -115,7 +117,7 @@
 	$("#" + tag).html(createPrivateTabContent(nick, tag));
 	
 	var anticache = new Date().getTime();
-	$.get(lamsUrl + "PresenceChatLogger.do", {method: "getConversationHistory", roomName:CONFERENCEROOM, from:NICK, to:nick, anticache:anticache}, handleGetConversation);
+	$.post(lamsUrl + "PresenceChatLogger.do", {method: "getConversationHistory", roomName:CONFERENCEROOM, from:NICK, to:nick, anticache:anticache}, handleGetConversation);
 }
 
 function htmlEnc(str) {
@@ -174,6 +176,14 @@
 	return tag + '_contextMenu';
 }
 
+function nickToTabLabel(nick){
+	return tagToTabLabel(nickToTag(nick));
+}
+
+function tagToTabLabel(tag){
+	return tag + '_tabLabel';
+}
+
 function parseXml(xml) {  
 	if (jQuery.browser.msie) {  
 		var xmlDoc = new ActiveXObject("Microsoft.XMLDOM");  
@@ -285,6 +295,8 @@
 			else if(action == "block" && !blocked){
 				roster.users[rosterIndex].blocked = handleAllowBlockClick(tag, blocked);
 			}
+			
+			roster.updateDisplay();
 	});
 }
 
@@ -406,7 +418,7 @@
 		if(listing.length == 0){
 			// create listing div
 			// note: attrId must be added to array before onClick
-			var listingDiv = $('<div id="' + listingName + '" rosterIndex="' + i + '" onClick="handlePresenceLeftClick(\'' + listingName + '\');" class="presenceName">' + createPresenceListing(nick, tag) + '</div>');
+			var listingDiv = $('<div id="' + listingName + '" rosterIndex="' + i + '" onClick="handlePresenceLeftClick(\'' + listingName + '\');" class="presenceListing">' + createPresenceListing(nick, tag) + '</div>');
 			
 			// add the listing div
 			rosterDiv.append(listingDiv);
@@ -446,9 +458,18 @@
 		// set the correct icon depending on status
 		if(available == "available"){
 			availableCount++;
-			listingImage.attr("src", "../images/icons/user_online.png");
+			
+			if(blocked){
+				listingImage.attr("src", "../images/icons/user_online_blocked.png");
+			}else{
+				listingImage.attr("src", "../images/icons/user_online.png");
+			}
 		}else{
-			listingImage.attr("src", "../images/icons/user_offline.png");
+			if(blocked){
+				listingImage.attr("src", "../images/icons/user_offline_blocked.png");
+			}else{
+				listingImage.attr("src", "../images/icons/user_offline.png");
+			}
 		}
 	}
 	
@@ -524,10 +545,10 @@
 	var aMsg = new JSJaCMessage();
 	
 	// prepare nick
-	var toNick = "";
+	var toNick;
 	
 	// prepare user
-	var user = null;
+	var user;
 	
 	// if the form has a hidden sendTo input, it's a private message
 	if (aForm.sendTo) {
@@ -536,34 +557,33 @@
 		aMsg.setTo(CONFERENCEROOM + "/" + toNick);
 		aMsg.setType("chat");
 		aMsg.setBody(aForm.messageInput.value);
-  		// apending the private message to the incoming window,
-  		// since the jabber server will not echo sent private messages.
-  		// TODO: need to check if this is correct behaviour
+		
+		// append message to one's own window (jabber doesn't send message back to sender)
 		if (!(NICK == toNick)) {
 			updateMessageDisplay(nickToMessageArea(toNick), generateMessageHTML(NICK, aForm.messageInput.value, null));
 		}
-
-		// log message
-		$.get(lamsUrl + "PresenceChatLogger.do", {method: "saveMessage", roomName:CONFERENCEROOM, from:NICK, to:toNick, dateSent:new Date(), message:aForm.messageInput.value}, null);
 	}
 	// otherwise, it's a group chat message
 	else {
+		toNick = null;
+		user = null
 		aMsg.setTo(CONFERENCEROOM);
 		aMsg.setType("groupchat");
 		aMsg.setBody(aForm.messageInput.value);
-		
-		$.get(lamsUrl + "PresenceChatLogger.do", {method: "saveMessage", roomName:CONFERENCEROOM, from:NICK, to:null, dateSent:new Date(), message:aForm.messageInput.value}, null);
 	}
   	
 	aMsg.setFrom(USERNAME + "@" + XMPPDOMAIN + "/" + RESOURCE);
 	
 	// if groupchat or if user is available
-	if(user == null || user.status == "available"){
+	if(!user || user.status == "available"){
+		// log message
+		$.post(lamsUrl + "PresenceChatLogger.do", {method: "saveMessage", roomName:CONFERENCEROOM, from:NICK, to:toNick, dateSent:new Date(), message:aForm.messageInput.value}, null);
+	
 		// send message
 		con.send(aMsg);
 	}
 	// otherwise if not groupchat and user is unavailable
-	else if(user != null && user.status == "unavailable"){
+	else if(user && user.status == "unavailable"){
 		// generate the emote message and display it to user
 		var emoteMessage = generateEmoteHTML("Your previous message has not been sent because " + toNick + " is unavailable");
 		updateMessageDisplay(nickToMessageArea(toNick), emoteMessage);
@@ -591,12 +611,12 @@
 	
 	// prepare htmlMessage
 	var htmlMessage;
-	
-	// get the tag from nick
-	var tag = nickToTag(nick);
-			
+				
 	// if message is private chat
-	if (type == "chat") {
+	if (type == "chat") {	
+		// get the tag from nick
+		var tag = nickToTag(nick);
+		
 		// get user from nick
 		var user = roster.getUserByNick(nick);
 		
@@ -607,27 +627,24 @@
 				// add a tab
 				addTab(nick, tag);
 				
-				// make the sender's tab label bold
-				$('#' + tag + '_tabLabel').html('<b>' + nick + '</b>');
-				
 				// don't add the message, let the log take care of that
 			}
 			// if there is a tab for the send open
-			else{
-				// get the selected tab
-				var selected = $("#presenceChatTabs").tabs().data('selected.tabs');
-				
-				// if the selected tab is any other than sender's tab
-				if(getUserFromTabIndex(selected).tag != tag){
-					// make the sender's tab label bold
-					$('#' + tag + '_tabLabel').html('<b>' + nick + '</b>');
-					$("#presenceChatTabs").tabs('_tabify', false);
-				}
-				
+			else{				
 				// generate html
 				htmlMessage = generateMessageHTML(nick, message, null);
 			}
 			
+			// get the selected tab
+			var selected = $("#presenceChatTabs").tabs().data('selected.tabs');
+			
+			// if the selected tab is any other than sender's tab
+			if(getUserFromTabIndex(selected).tag != tag){
+				// notify of new message
+				$("#" + tagToTabLabel(tag)).addClass('presenceTabNewMessage');
+				$("#" + tagToListing(tag)).addClass('presenceListingNewMessage');
+			}
+				
 			// add the div to the sender's tab
 			updateMessageDisplay(nickToMessageArea(nick), htmlMessage);
 		}
@@ -641,8 +658,7 @@
 			// if the selected tab is any other than groupchat
 			if(selected != 0){
 				// make the group chat label label bold
-				$('#groupchat_tabLabel').html('<b>Group Chat</b>');
-				$("#presenceChatTabs").tabs('_tabify', false);
+				$("#" + tagToTabLabel(groupChatInfo.tag)).addClass('presenceTabNewMessage');
 			}
 		
 			htmlMessage = generateMessageHTML(nick, message, null);
@@ -715,8 +731,8 @@
 		if(showStatus){
 			// if the selected tab is any other than groupchat
 			if(selected != 0){
-				// make the group chat label bold
-				$('#groupchat_tabLabel').html('<b>Group Chat</b>');
+				// make the group chat label label bold
+				$("#" + tagToTabLabel(groupChatInfo.tag)).addClass('presenceTabNewMessage');
 			}
 			
 			// generate the emote message and display it to group chat
@@ -732,13 +748,14 @@
 		
 		// if the person who got disconnected has a tab open
 		if(document.getElementById(nickToMessageArea(nick)) != null){		
-			// if the selected tab is any other than sender's tab
-			if(getUserFromTabIndex(selected).tag != tag){
-				// make the sender's tab label bold
-				$('#' + tag + '_tabLabel').html('<b>' + nick + '</b>');
-			}
-			
+			// if showing status messages			
 			if(showStatus){
+				// if the selected tab is any other than sender's tab
+				if(getUserFromTabIndex(selected).tag != tag){
+					// notify of new message
+					$("#" + tagToTabLabel(tag)).addClass('presenceTabNewMessage');
+				}
+				
 				// generate the emote message and display it to private chat
 				var emoteMessage;
 				if(user.status == "unavailable"){
@@ -779,7 +796,7 @@
 	
 	// get group chat history
 	var anticache = new Date().getTime();
-	$.get(lamsUrl + "PresenceChatLogger.do", {method: "getGroupHistory", roomName:CONFERENCEROOM, anticache:anticache}, handleGetGroupHistory);
+	$.post(lamsUrl + "PresenceChatLogger.do", {method: "getGroupHistory", roomName:CONFERENCEROOM, anticache:anticache}, handleGetGroupHistory);
 }
 
 function handleDisconnected() {
@@ -883,7 +900,7 @@
 }
 
 function doRegistration(){
-	$.get(xmppServlet, {method: "createXmppId"}, handlePresenceRegistration);
+	$.post(xmppServlet, {method: "createXmppId"}, handlePresenceRegistration);
 }
 
 /*
Index: lams_learning/web/includes/presenceChat.jsp
===================================================================
diff -u -r0bbad8932a51efb88ac79f78bf2c7d7396554fe9 -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82
--- lams_learning/web/includes/presenceChat.jsp	(.../presenceChat.jsp)	(revision 0bbad8932a51efb88ac79f78bf2c7d7396554fe9)
+++ lams_learning/web/includes/presenceChat.jsp	(.../presenceChat.jsp)	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
@@ -25,36 +25,61 @@
 				
 				// labels
 				var presenceLabel = "<fmt:message key='label.presence'/>";
-								
+				
+				// on startup
 				$(document).ready(function (){
-					// if presence im is enabled
-					<c:if test="${param.presenceImEnabled}">
-						// create chat tabs
-						$("#presenceChatTabs").tabs({ scrollable: true });
+					// if browser is ie6
+					if($.browser.msie && parseInt($.browser.version) == 6){
+						// make warningvisible
+						$("#presenceChatWarning").removeClass("startHidden");
+					}
+					// otherwise enable presence chat
+					else{
+						// if presence im is enabled
+						<c:if test="${param.presenceImEnabled}">
+							// make visible
+							$("#presenceChat").removeClass("startHidden");
 						
-						// bind the select function which resets label to non-bold when clicked
-						$("#presenceChatTabs").bind('tabsselect', function(event, ui) {
-							var nick = getUserFromTag(ui.panel.id).nick;
-							$('#' + ui.panel.id + '_tabLabel').html(nick);
-							$("#presenceChatTabs").tabs('scrollTo', ui.tab.offsetLeft);
-						});
-					</c:if>
-					
-					// create roster tab
-					$("#presenceChatRoster").tabs({ scrollable: false });
-
-
-					// correct room name				
-					roomName = correctPresenceRoomName(roomName);
-					
-					// attempt to login once the window is loaded
-					doLogin(presenceUrl, userId, userId, userId, roomName, nickname, false);
+							// create chat tabs
+							$("#presenceChatTabs").tabs({ scrollable: true });
+							
+							// bind the select function to do extra stuff
+							$("#presenceChatTabs").bind('tabsselect', function(event, ui) {
+								// remove visual indicators of new message
+								var tag = ui.panel.id;
+								$("#" + tagToTabLabel(tag)).removeClass('presenceTabNewMessage');
+								$("#" + tagToListing(tag)).removeClass('presenceListingNewMessage');
+								
+								// scroll to the clicked tab
+								$("#presenceChatTabs").tabs('scrollTo', ui.tab.offsetLeft);
+							});
+							
+							// bind the show function to do extra stuff
+							$("#presenceChatTabs").bind('tabsshow', function(event, ui) {
+								// get the tag
+								var tag = ui.panel.id;
+								
+								// scroll to the bottom of the given message area
+								var messageArea = $("#" + tagToMessageArea(tag));
+								messageArea.attr("scrollTop", messageArea.attr("scrollHeight"));
+							});
+						</c:if>
+						
+						// create roster tab
+						$("#presenceChatRoster").tabs({ scrollable: false });
+	
+						// correct room name				
+						roomName = correctPresenceRoomName(roomName);
+						
+						// attempt to login once the window is loaded
+						doLogin(presenceUrl, userId, userId, userId, roomName, nickname, false);
+					}
 				});
 				
 			</script>
 			
 			<%-- initial html / presence.js adds on html into here --%>
-			<div id="presenceChat">
+			<div id="presenceChat" class="startHidden">
 				<%-- only pop the message box if im is enabled --%>
 				<c:if test="${param.presenceImEnabled}">
 				<div id="presenceChatTabs">
@@ -93,6 +118,7 @@
 				    </div>
 				</div>
 				</c:if>
+				<%-- always pop the roster --%>
 				<div id="presenceChatRoster">
 					<ul onclick="javascript:handlePresenceClick()">
 				        <li><a href="#presenceUserListings" onclick="javascript:handlePresenceClick()">
@@ -111,5 +137,12 @@
 				    </div>
 				</div>
 			</div>
+			
+			<%-- div reserved for storing context menus --%>
 			<div id="presenceContextMenus">		
+			</div>
+			
+			<%-- floating div shown when IE6 is being used --%>
+			<div id="presenceChatWarning" class="startHidden warning">
+				Sorry, Internet Explorer 6 is not compatible with Presence Chat
 			</div>
\ No newline at end of file
Index: lams_learning/web/mainflash.jsp
===================================================================
diff -u -r61df3f3f473a3619f93c63ceb879ae36438020e8 -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82
--- lams_learning/web/mainflash.jsp	(.../mainflash.jsp)	(revision 61df3f3f473a3619f93c63ceb879ae36438020e8)
+++ lams_learning/web/mainflash.jsp	(.../mainflash.jsp)	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
@@ -153,7 +153,7 @@
 		</div>
 		
 		<c:if test="${param.presenceEnabledPatch}">
-		    <%@ include file="/includes/presenceChat.jsp" %>
+    		<%@ include file="/includes/presenceChat.jsp" %>
 		</c:if>
 		
 		<iframe onload="javascript:resizeIframe()" id="contentFrame" name="contentFrame" src="content.do?lessonID=<c:out value="${param.lessonID}"/>" scrolling="auto" style="border: none ; margin-left: 160px;">
Index: lams_tool_videorecorder/build.xml
===================================================================
diff -u -r0bbad8932a51efb88ac79f78bf2c7d7396554fe9 -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82
--- lams_tool_videorecorder/build.xml	(.../build.xml)	(revision 0bbad8932a51efb88ac79f78bf2c7d7396554fe9)
+++ lams_tool_videorecorder/build.xml	(.../build.xml)	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
@@ -482,7 +482,7 @@
 
 	</target>
 	
-	<target name="deploy-tool" depends="create-deploy-package, run-deploy-package, explode-tool" 
+	<target name="deploy-tool" depends="create-deploy-package, run-deploy-package" 
 	   description="Build the war, jar and run the deploy tool. Deletes most old tool references from db, creates db tables, application.xml in ear, copies war and jar file to ear. deploy-tool is only designed to be run in a development environment, or on an empty db. Do not run on a production environment.">
 	</target>
 
Index: lams_tool_videorecorder/conf/hibernate/mappings/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorder.hbm.xml
===================================================================
diff -u -r01f1d853607cc14f73aa2429275084f4890f92b7 -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82
--- lams_tool_videorecorder/conf/hibernate/mappings/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorder.hbm.xml	(.../VideoRecorder.hbm.xml)	(revision 01f1d853607cc14f73aa2429275084f4890f92b7)
+++ lams_tool_videorecorder/conf/hibernate/mappings/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorder.hbm.xml	(.../VideoRecorder.hbm.xml)	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
@@ -250,6 +250,14 @@
 
         </set>
 
+        <one-to-one
+            name="authorRecording"
+            class="org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderRecording"
+            cascade="none"
+            outer-join="auto"
+            constrained="false"
+        />
+
         <set
             name="conditions"
             lazy="true"
Index: lams_tool_videorecorder/conf/hibernate/mappings/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderRecording.hbm.xml
===================================================================
diff -u -r01f1d853607cc14f73aa2429275084f4890f92b7 -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82
--- lams_tool_videorecorder/conf/hibernate/mappings/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderRecording.hbm.xml	(.../VideoRecorderRecording.hbm.xml)	(revision 01f1d853607cc14f73aa2429275084f4890f92b7)
+++ lams_tool_videorecorder/conf/hibernate/mappings/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderRecording.hbm.xml	(.../VideoRecorderRecording.hbm.xml)	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
@@ -93,6 +93,14 @@
             column="is_just_sound"
         />
 
+        <property
+            name="isLocal"
+            type="java.lang.Boolean"
+            update="true"
+            insert="true"
+            column="is_local"
+        />
+
         <many-to-one
             name="videoRecorderSession"
             class="org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderSession"
Index: lams_tool_videorecorder/conf/hibernate/mappings/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderSession.hbm.xml
===================================================================
diff -u -r3d081de4a45da632ee6029251318fac795d41813 -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82
--- lams_tool_videorecorder/conf/hibernate/mappings/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderSession.hbm.xml	(.../VideoRecorderSession.hbm.xml)	(revision 3d081de4a45da632ee6029251318fac795d41813)
+++ lams_tool_videorecorder/conf/hibernate/mappings/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderSession.hbm.xml	(.../VideoRecorderSession.hbm.xml)	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
@@ -68,6 +68,15 @@
             length="250"
         />
 
+        <property
+            name="contentFolderId"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="content_folder_id"
+            length="32"
+        />
+
         <many-to-one
             name="videoRecorder"
             class="org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorder"
Index: lams_tool_videorecorder/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -readd60f14d83be44b1462a401bc3d1dac0e02b01 -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82
--- lams_tool_videorecorder/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision eadd60f14d83be44b1462a401bc3d1dac0e02b01)
+++ lams_tool_videorecorder/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
@@ -186,6 +186,7 @@
 videorecorder.tooltip.already.rated  =You have given this recording a rating of
 videorecorder.disabled  =Disabled
 videorecorder.instructor  =Instructor
+videorecorder.error.noconfig  = LAMS does not have a media server configured. Please contact your system administrator.
 output.desc.number.recordings.definition.videoRecorder  =Learner's number of recordings created
 output.desc.number.comments.definition.videoRecorder  =Learner's number of comments made on recordings
 output.desc.number.ratings.definition.videoRecorder  =Learner's number of ratings given to recordings
Index: lams_tool_videorecorder/db/sql/create_lams_tool_videoRecorder.sql
===================================================================
diff -u -re1dcf9367f649f3377f37e93da076cb6956cce30 -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82
--- lams_tool_videorecorder/db/sql/create_lams_tool_videoRecorder.sql	(.../create_lams_tool_videoRecorder.sql)	(revision e1dcf9367f649f3377f37e93da076cb6956cce30)
+++ lams_tool_videorecorder/db/sql/create_lams_tool_videoRecorder.sql	(.../create_lams_tool_videoRecorder.sql)	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
@@ -37,6 +37,7 @@
 	content_in_use bit,
 	define_later bit,
 	tool_content_id bigint,
+	author_recording_id bigint,
 	allow_use_voice bit,
 	allow_use_camera bit,
 	allow_learner_video_visibility bit,
@@ -55,6 +56,7 @@
 	status integer, session_id bigint,
 	session_name varchar(250),
 	videoRecorder_uid bigint,
+	content_folder_id varchar(32),
 	primary key (uid)
 )type=innodb;
 
@@ -68,6 +70,7 @@
 	description varchar(1027),
 	rating float,
 	filename varchar(255),
+	is_local bit,
 	is_just_sound bit,
 	videoRecorder_session_uid bigint,
 	primary key (uid)
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dto/VideoRecorderDTO.java
===================================================================
diff -u -re1dcf9367f649f3377f37e93da076cb6956cce30 -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dto/VideoRecorderDTO.java	(.../VideoRecorderDTO.java)	(revision e1dcf9367f649f3377f37e93da076cb6956cce30)
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dto/VideoRecorderDTO.java	(.../VideoRecorderDTO.java)	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
@@ -79,6 +79,8 @@
 
 	public Set<VideoRecorderSessionDTO> sessionDTOs = new TreeSet<VideoRecorderSessionDTO>();
 	
+	public VideoRecorderRecordingDTO authorRecording;
+	
 	public Long currentTab;
 	
 	/* Constructors */
@@ -101,10 +103,13 @@
 		exportOffline = videoRecorder.isExportOffline();
 		reflectOnActivity = videoRecorder.isReflectOnActivity();
 		reflectInstructions = videoRecorder.getReflectInstructions();
-
 		onlineInstructionsFiles = new TreeSet<VideoRecorderAttachmentDTO>();
 		offlineInstructionsFiles = new TreeSet<VideoRecorderAttachmentDTO>();
 
+		if(videoRecorder.getAuthorRecording() != null){
+			authorRecording = new VideoRecorderRecordingDTO();
+		}
+		
 		for (Iterator i = videoRecorder.getVideoRecorderAttachments().iterator(); i.hasNext();) {
 			VideoRecorderAttachment att = (VideoRecorderAttachment) i.next();
 			if (att.getFileType().equals(IToolContentHandler.TYPE_OFFLINE)) {
@@ -158,6 +163,14 @@
 		return offlineInstructionsFiles;
 	}
 
+	public VideoRecorderRecordingDTO getAuthorRecording() {
+		return authorRecording;
+	}
+
+	public void setAuthorRecording(VideoRecorderRecordingDTO authorRecording) {
+		this.authorRecording = authorRecording;
+	}
+	
 	public void setOfflineInstructionsFiles(
 			Set<VideoRecorderAttachmentDTO> offlineInstructionsFiles) {
 		this.offlineInstructionsFiles = offlineInstructionsFiles;
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dto/VideoRecorderRecordingDTO.java
===================================================================
diff -u -r42aa5319fbd33938828764c43dd0ab1ca80e2416 -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dto/VideoRecorderRecordingDTO.java	(.../VideoRecorderRecordingDTO.java)	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dto/VideoRecorderRecordingDTO.java	(.../VideoRecorderRecordingDTO.java)	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
@@ -63,6 +63,8 @@
 	public Float rating;
 	
 	public Boolean isJustSound;
+	
+	public Boolean isLocal;
     
 	public VideoRecorderSession videoRecorderSession;
 	
@@ -85,6 +87,7 @@
 		this.description = videoRecorderRecording.getDescription();
 		this.rating = videoRecorderRecording.getRating();
 		this.isJustSound = videoRecorderRecording.getIsJustSound();
+		this.isLocal = videoRecorderRecording.getIsLocal();
 		this.videoRecorderSession = videoRecorderRecording.getVideoRecorderSession();
 		this.filename = videoRecorderRecording.getFilename();
 		this.ratings = VideoRecorderRatingDTO.getVideoRecorderRatingDTOs(videoRecorderRecording.getRatings());
@@ -178,7 +181,15 @@
 	public void setIsJustSound(Boolean isJustSound) {
 		this.isJustSound = isJustSound;
 	}
+	
+	public Boolean getIsLocal() {
+		return isLocal;
+	}
 
+	public void setIsLocal(Boolean isLocal) {
+		this.isLocal = isLocal;
+	}
+
 	public VideoRecorderSession getVideoRecorderSession() {
 		return this.videoRecorderSession;
 	}
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dto/VideoRecorderSessionDTO.java
===================================================================
diff -u -r3d081de4a45da632ee6029251318fac795d41813 -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dto/VideoRecorderSessionDTO.java	(.../VideoRecorderSessionDTO.java)	(revision 3d081de4a45da632ee6029251318fac795d41813)
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dto/VideoRecorderSessionDTO.java	(.../VideoRecorderSessionDTO.java)	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
@@ -36,17 +36,20 @@
 	
 	Long sessionID;
 
+	String contentFolderId;
+	
 	String sessionName;
 	
 	Set<VideoRecorderUserDTO> userDTOs = new TreeSet<VideoRecorderUserDTO>();
 	
 	int numberOfLearners;
 	
-	int numberOfFinishedLearners;;
+	int numberOfFinishedLearners;
 	
 	public VideoRecorderSessionDTO(VideoRecorderSession session) {
 		this.sessionID = session.getSessionId();
 		this.sessionName = session.getSessionName();
+		this.contentFolderId = session.getContentFolderId();
 		
 		numberOfFinishedLearners = 0;
 		for (Iterator iterator = session.getVideoRecorderUsers().iterator(); iterator.hasNext();) {
@@ -80,6 +83,14 @@
 		this.sessionName = sessionName;
 	}
 
+	public String getContentFolderId() {
+		return contentFolderId;
+	}
+
+	public void setContentFolderId(String contentFolderId) {
+		this.contentFolderId = contentFolderId;
+	}
+	
 	public int compareTo(Object o) {
 		int returnValue;
 		VideoRecorderSessionDTO toSession = (VideoRecorderSessionDTO)o;
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorder.java
===================================================================
diff -u -re1dcf9367f649f3377f37e93da076cb6956cce30 -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorder.java	(.../VideoRecorder.java)	(revision e1dcf9367f649f3377f37e93da076cb6956cce30)
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorder.java	(.../VideoRecorder.java)	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
@@ -100,6 +100,8 @@
 
     private Set videoRecorderSessions;
 
+    private VideoRecorderRecording authorRecording;
+    
     private Set<VideoRecorderCondition> conditions = new TreeSet<VideoRecorderCondition>(new TextSearchConditionComparator());
 
     // *********** NON Persisit fields
@@ -116,8 +118,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, boolean exportAll,
-	    boolean exportOffline, boolean reflectOnActivity, String reflectInstructions) {
+	    Long toolContentId, Set videoRecorderAttachments, Set videoRecorderSessions, VideoRecorderRecording authorRecording,
+	    boolean exportAll, boolean exportOffline, boolean reflectOnActivity, String reflectInstructions) {
 	this.createDate = createDate;
 	this.updateDate = updateDate;
 	this.createBy = createBy;
@@ -132,6 +134,7 @@
 	this.toolContentId = toolContentId;
 	this.videoRecorderAttachments = videoRecorderAttachments;
 	this.videoRecorderSessions = videoRecorderSessions;
+	this.authorRecording = authorRecording;
 	this.allowUseVoice = allowUseVoice;
 	this.allowUseCamera = allowUseCamera;
 	this.allowLearnerVideoVisibility = allowLearnerVideoVisibility;
@@ -446,7 +449,24 @@
     public void setVideoRecorderSessions(Set videoRecorderSessions) {
 	this.videoRecorderSessions = videoRecorderSessions;
     }
+    
+	/**
+     * @return Returns the first recording made by author
+     *
+     * @hibernate.one-to-one
+     * 		column="author_recording_id"
+     *  	cascade="none"
+     *
+     */
 
+    public VideoRecorderRecording getAuthorRecording() {
+	return authorRecording;
+    }
+
+    public void setAuthorRecording(VideoRecorderRecording authorRecording) {
+	this.authorRecording = authorRecording;
+    }
+    
     /**
      * @hibernate.set lazy="true" cascade="all"
      *                sort="org.lamsfoundation.lams.learningdesign.TextSearchConditionComparator"
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderComment.java
===================================================================
diff -u -r049932651d9d1c08ed1681df0a044d7f519a4215 -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderComment.java	(.../VideoRecorderComment.java)	(revision 049932651d9d1c08ed1681df0a044d7f519a4215)
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderComment.java	(.../VideoRecorderComment.java)	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
@@ -142,7 +142,7 @@
     }
 
 	/**
-     * @return Returns the VideoRecorderUser of the person who created the recording
+     * @return Returns the VideoRecorderRecording of the comment
      *
      * @hibernate.many-to-one
      * 		column="videoRecorder_recording_uid"
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderRecording.java
===================================================================
diff -u -r42aa5319fbd33938828764c43dd0ab1ca80e2416 -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderRecording.java	(.../VideoRecorderRecording.java)	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderRecording.java	(.../VideoRecorderRecording.java)	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
@@ -28,6 +28,7 @@
 import java.util.List;
 import java.util.Set;
 
+import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.tool.videoRecorder.dto.VideoRecorderRecordingDTO;
 import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderUser;
 import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderSession;
@@ -60,6 +61,8 @@
     
     private String filename;
     
+    private Boolean isLocal;
+    
     private Boolean isJustSound;
     
     private VideoRecorderUser createBy;
@@ -84,6 +87,7 @@
 		this.title = recording.title;
 		this.description = recording.description;
 		this.rating = recording.rating;
+		this.isLocal = recording.isLocal;
 		this.isJustSound = recording.isJustSound;
 		this.ratings = VideoRecorderRating.getVideoRecorderRatings(recording.ratings);
 		this.comments = VideoRecorderComment.getVideoRecorderComments(recording.comments);
@@ -100,6 +104,7 @@
 		this.title = recording.title;
 		this.description = recording.description;
 		this.rating = recording.rating;
+		this.isLocal = recording.isLocal;
 		this.isJustSound = false;
 		this.ratings = null;
 		this.comments = null;
@@ -110,7 +115,7 @@
 	/** full constructor */
 	public VideoRecorderRecording(
 			Date createDate, Date updateDate, VideoRecorderUser createBy, String title, String description,
-			Float rating, Boolean isJustSound, Long videoRecorderUid, VideoRecorderSession videoRecorderSession, String filename,
+			Float rating, Boolean isJustSound, Boolean isLocal, Long videoRecorderUid, VideoRecorderSession videoRecorderSession, String filename,
 			Set ratings, Set comments, Long toolContentId) {
 				
 		this.createDate = createDate;
@@ -120,13 +125,14 @@
 		this.description = description;
 		this.rating = rating;
 		this.isJustSound = isJustSound;
+		this.isLocal = isLocal;
 		this.ratings = ratings;
 		this.comments = comments;
 		this.videoRecorderSession = videoRecorderSession;
 		this.filename = filename;
 		this.toolContentId = toolContentId;
 	}
-
+    
     // Property accessors
     /**
      * @hibernate.id generator-class="native" type="java.lang.Long" column="uid"
@@ -248,6 +254,19 @@
     public void setIsJustSound(Boolean isJustSound) {
 	this.isJustSound = isJustSound;
     }   
+
+    /**
+     * @hibernate.property column="is_local"
+     * 
+     */
+
+    public Boolean getIsLocal() {
+	return isLocal;
+    }
+
+    public void setIsLocal(Boolean isLocal) {
+	this.isLocal = isLocal;
+    }   
     
 	/**
      * Gets the toolSession
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderSession.java
===================================================================
diff -u -r42aa5319fbd33938828764c43dd0ab1ca80e2416 -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderSession.java	(.../VideoRecorderSession.java)	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderSession.java	(.../VideoRecorderSession.java)	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
@@ -58,6 +58,8 @@
 	private Long sessionId;
 
 	private String sessionName;
+	
+	private String contentFolderId;
 
 	private VideoRecorder videoRecorder;
 
@@ -71,13 +73,14 @@
 
 	/** full constructor */
 	public VideoRecorderSession(Date sessionEndDate, Date sessionStartDate,
-			Integer status, Long sessionId, String sessionName, VideoRecorder videoRecorder,
+			Integer status, Long sessionId, String sessionName, String contentFolderId, VideoRecorder videoRecorder,
 			Set videoRecorderUsers) {
 		this.sessionEndDate = sessionEndDate;
 		this.sessionStartDate = sessionStartDate;
 		this.status = status;
 		this.sessionId = sessionId;
 		this.sessionName = sessionName;
+		this.contentFolderId = contentFolderId;
 		this.videoRecorder = videoRecorder;
 		this.videoRecorderUsers = videoRecorderUsers;
 	}
@@ -165,7 +168,20 @@
 	public void setSessionName(String sessionName) {
 		this.sessionName = sessionName;
 	}
+	
+	/**
+	 * @hibernate.property column="content_folder_id" length="32"
+	 * 
+	 */
 
+	public String getContentFolderId() {
+		return this.contentFolderId;
+	}
+
+	public void setContentFolderId(String contentFolderId) {
+		this.contentFolderId = contentFolderId;
+	}
+
 	/**
 	 * @hibernate.many-to-one not-null="true"
 	 * @hibernate.column name="videoRecorder_uid"
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/VideoRecorderService.java
===================================================================
diff -u -r61df3f3f473a3619f93c63ceb879ae36438020e8 -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/VideoRecorderService.java	(.../VideoRecorderService.java)	(revision 61df3f3f473a3619f93c63ceb879ae36438020e8)
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/VideoRecorderService.java	(.../VideoRecorderService.java)	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
@@ -88,6 +88,7 @@
 import org.lamsfoundation.lams.tool.videoRecorder.util.VideoRecorderException;
 import org.lamsfoundation.lams.tool.videoRecorder.util.VideoRecorderToolContentHandler;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.FileUtil;
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.util.audit.IAuditService;
@@ -152,6 +153,8 @@
 	VideoRecorderSession session = new VideoRecorderSession();
 	session.setSessionId(toolSessionId);
 	session.setSessionName(toolSessionName);
+	session.setContentFolderId(FileUtil.generateUniqueContentFolderID());
+	
 	// learner starts
 	// TODO need to also set other fields.
 	VideoRecorder videoRecorder = videoRecorderDAO.getByContentId(toolContentId);
@@ -283,8 +286,16 @@
 	// set ResourceToolContentHandler as null to avoid copy file node in
 	// repository again.
 	videoRecorder = VideoRecorder.newInstance(videoRecorder, toolContentId, null);
+	videoRecorder.setToolContentId(null);
 	videoRecorder.setToolContentHandler(null);
 	videoRecorder.setVideoRecorderSessions(null);
+	
+	VideoRecorderRecording authorRecording = (VideoRecorderRecording)getFirstRecordingByToolContentId(toolContentId).clone();
+	authorRecording.setToolContentId(null);
+	authorRecording.setComments(null);
+	authorRecording.setRatings(null);
+	videoRecorder.setAuthorRecording(authorRecording);
+	
 	Set<VideoRecorderAttachment> atts = videoRecorder.getVideoRecorderAttachments();
 	for (VideoRecorderAttachment att : atts) {
 	    att.setVideoRecorder(null);
@@ -317,12 +328,18 @@
 			+ toolPOJO);
 	    }
 	    VideoRecorder videoRecorder = (VideoRecorder) toolPOJO;
-
+	    
+	    VideoRecorderRecording recording = videoRecorder.getAuthorRecording();
+	    
 	    // reset it to new toolContentId
 	    videoRecorder.setToolContentId(toolContentId);
-	    videoRecorder.setCreateBy(new Long(newUserUid.longValue()));
+	    videoRecorder.getAuthorRecording().setToolContentId(toolContentId);
 
 	    videoRecorderDAO.saveOrUpdate(videoRecorder);
+	    
+	    if(recording != null){
+	    	videoRecorderRecordingDAO.saveOrUpdate(recording);
+	    }
 	} catch (ImportToolContentException e) {
 	    throw new ToolException(e);
 	}
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/LearningAction.java
===================================================================
diff -u -r42aa5319fbd33938828764c43dd0ab1ca80e2416 -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/LearningAction.java	(.../LearningAction.java)	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
@@ -29,13 +29,16 @@
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 
 import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
+import org.lamsfoundation.lams.dao.IBaseDAO;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
+import org.lamsfoundation.lams.tool.ToolSession;
 import org.lamsfoundation.lams.tool.ToolSessionManager;
 import org.lamsfoundation.lams.tool.exception.DataMissingException;
 import org.lamsfoundation.lams.tool.exception.ToolException;
@@ -57,6 +60,8 @@
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.lamsfoundation.lams.util.Configuration;
 import org.lamsfoundation.lams.util.ConfigurationKeys;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
 
 /**
  * @author
@@ -79,7 +84,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.
@@ -135,6 +140,14 @@
 		request.setAttribute("toolSessionId", toolSessionID);
 		request.setAttribute("toolContentId", toolContentID);
 		
+		// getting the contentfolderid using the session and lesson
+		WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext());
+		IBaseDAO baseDAO =(IBaseDAO) ctx.getBean("baseDAO");
+		ToolSession toolSession = (ToolSession)baseDAO.find(ToolSession.class, toolSessionID);
+		String contentFolderId = toolSession.getLesson().getLearningDesign().getContentFolderID();
+		
+		request.setAttribute("contentFolderId", contentFolderId);
+		
 		// set language xml
 		request.setAttribute("languageXML", videoRecorderService.getLanguageXML());
 		
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/VideoRecorderAction.java
===================================================================
diff -u
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/VideoRecorderAction.java	(revision 0)
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/VideoRecorderAction.java	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
@@ -0,0 +1,610 @@
+/****************************************************************
+ * 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.tool.videoRecorder.web.actions;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.log4j.Logger;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.lamsfoundation.lams.dao.IBaseDAO;
+import org.lamsfoundation.lams.tool.ToolSession;
+import org.lamsfoundation.lams.tool.videoRecorder.dto.VideoRecorderCommentDTO;
+import org.lamsfoundation.lams.tool.videoRecorder.dto.VideoRecorderRatingDTO;
+import org.lamsfoundation.lams.tool.videoRecorder.dto.VideoRecorderRecordingDTO;
+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.VideoRecorderServiceProxy;
+import org.lamsfoundation.lams.tool.videoRecorder.util.VideoRecorderRecordingComparator;
+import org.lamsfoundation.lams.util.Base64StringToImageUtil;
+import org.lamsfoundation.lams.util.Configuration;
+import org.lamsfoundation.lams.util.ConfigurationKeys;
+import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.web.action.LamsDispatchAction;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+
+/** 
+* @author Paul Georges
+
+* ----------------XDoclet Tags--------------------
+* 
+* @struts:action path="/videoRecorderActions" 
+*                parameter="method" 
+*                validate="false"
+* 
+* ----------------XDoclet Tags--------------------
+*/
+public class VideoRecorderAction extends LamsDispatchAction {
+	
+	private static Logger logger = Logger.getLogger(VideoRecorderAction.class);
+
+    //---------------------------------------------------------------------
+	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";
+	private static final String FILENAME = "filename";
+	private static final String RECORDING_ID = "recordingId";
+	private static final String COMMENT_ID = "commentId";
+	private static final String RATING = "rating";
+	private static final String RATING_ID = "ratingId";
+	private static final String COMMENT = "comment";
+	private static final String IS_JUST_SOUND = "isJustSound";
+	private static final String IS_LOCAL = "isLocal";
+	private static final String SORT_BY = "sortBy";
+	private static final String SORT_DIR = "sortDirection";
+	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 EXTENSTION = "ext";
+	private static final String IMAGEDATA = "data";
+	private static final String DIR = "dir";
+
+	private static final String FLV_EXTENSION = ".flv";
+	private static final String JPG_EXTENSION = ".jpg";
+	
+	/** 
+	 * Desctipion
+     *
+	 * Input parameters: toolSessionID, userID (possibly null)
+	 * 
+	 * Output format: xml
+	 */
+	public ActionForward getRecordingsByToolSessionIdAndUserId(ActionMapping mapping,
+			ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) throws IOException, ServletException {
+
+		// 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);
+    	boolean getAll = WebUtil.readBooleanParam(request, GET_ALL);
+    	
+    	// get service
+		IVideoRecorderService videoRecorderService = VideoRecorderServiceProxy.getVideoRecorderService(getServlet().getServletContext());
+		
+		// get session
+		VideoRecorderSession session = videoRecorderService.getSessionBySessionId(toolSessionId);
+		
+		// create list of recording DTOs
+		List<VideoRecorderRecordingDTO> videoRecorderRecordingDTOs;
+		
+		// if no user is specified
+		if(getAll){
+			// get all recordings
+			videoRecorderRecordingDTOs = videoRecorderService.getRecordingsByToolSessionId(toolSessionId, toolContentId);
+		// otherwise
+		} else{
+			// get all recordings from user specified
+			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 contentFolderIdLearner = session.getContentFolderId();
+	    String previewImageLearnerPath = Configuration.get(ConfigurationKeys.SERVER_URL) + File.separator + "www" + File.separator + "secure" + File.separator + contentFolderIdLearner + File.separator + "previewImages" + File.separator;
+	    
+		WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext());
+		IBaseDAO baseDAO =(IBaseDAO) ctx.getBean("baseDAO");
+		ToolSession toolSession = (ToolSession)baseDAO.find(ToolSession.class, toolSessionId);
+		String contentFolderIdAuthor = toolSession.getLesson().getLearningDesign().getContentFolderID();
+	    String previewImageAuthorPath = Configuration.get(ConfigurationKeys.SERVER_URL) + File.separator + "www" + File.separator + "secure" + File.separator + contentFolderIdAuthor + File.separator + "Recordings" + File.separator;
+
+	    String soundOnlyImage = Configuration.get(ConfigurationKeys.SERVER_URL) + File.separator + "tool" + File.separator + "lavidr10" + File.separator + "images" + File.separator + "soundOnly.png";
+	    
+		String xmlOutput = buildVideoRecordingsXML(videoRecorderRecordingDTOs, userId, previewImageLearnerPath, previewImageAuthorPath, soundOnlyImage);
+		
+		response.setContentType("text/xml");
+		response.setCharacterEncoding("UTF-8");
+		writeAJAXResponse(response, xmlOutput);
+		return null;
+	}
+
+	public ActionForward saveRecording(ActionMapping mapping,
+			ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) throws IOException, ServletException {
+
+		try{
+			// get paramaters from POST
+			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, true);
+	    	String description = WebUtil.readStrParam(request, DESCRIPTION, true);
+	    	String filename = WebUtil.readStrParam(request, FILENAME, true);
+	    	Boolean isJustSound = WebUtil.readBooleanParam(request, IS_JUST_SOUND, false);
+	    	Boolean isLocal = WebUtil.readBooleanParam(request, IS_LOCAL, false);
+	    	int rating = WebUtil.readIntParam(request, RATING, false);
+	    	
+	    	title = title.replaceAll("[<>\"]", "");
+	    	description = description.replaceAll("[<>\"]", "");
+	    	
+	    	// get service
+			IVideoRecorderService videoRecorderService = VideoRecorderServiceProxy.getVideoRecorderService(getServlet().getServletContext());
+			
+			// initialize session, user and recording
+			VideoRecorderSession session = null;
+			VideoRecorderUser user = null;
+			VideoRecorderRecording videoRecording = null;
+			VideoRecorder videoRecorder = 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.setIsLocal(isLocal);
+						videoRecording.setRatings(null);
+						videoRecording.setComments(null);
+						videoRecording.setCreateBy(null);
+						videoRecording.setToolContentId(toolContentId);
+					}					
+				}
+				
+			}
+			// 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.setIsLocal(isLocal);
+					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);
+			
+			writeAJAXResponse(response, OK_MSG);
+			
+		}catch(Exception e){
+			writeAJAXResponse(response, ERROR_MSG + e.getMessage());
+		}
+		
+		return null;
+	}
+
+	public ActionForward deleteRecording(ActionMapping mapping,
+			ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) throws IOException, ServletException {
+
+		try{
+			// get paramaters from POST
+	    	Long recordingId = WebUtil.readLongParam(request, RECORDING_ID);
+	    	
+	    	// get service
+			IVideoRecorderService videoRecorderService = VideoRecorderServiceProxy.getVideoRecorderService(getServlet().getServletContext());
+			
+			// get videoRecording
+			VideoRecorderRecording videoRecording = videoRecorderService.getRecordingById(recordingId);
+			
+			// delete the videoRecording
+			videoRecorderService.deleteVideoRecorderRecording(videoRecording);
+			
+			writeAJAXResponse(response, OK_MSG);
+			
+		}catch(Exception e){
+			writeAJAXResponse(response, ERROR_MSG + e.getMessage());
+		}
+		
+		return null;
+	}
+	
+	public ActionForward saveComment(ActionMapping mapping,
+			ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) throws IOException, ServletException {
+		
+		try{
+			Long commentId = WebUtil.readLongParam(request, COMMENT_ID);
+	    	Long recordingId = WebUtil.readLongParam(request, RECORDING_ID);
+	    	Long toolSessionId = WebUtil.readLongParam(request, TOOL_SESSION_ID);
+	    	Long userId = WebUtil.readLongParam(request, USER_ID);
+	    	String commentText = WebUtil.readStrParam(request, COMMENT, true);
+	    	
+	    	commentText = commentText.replaceAll("[<>\"]", "");
+	    	
+	    	// get service
+			IVideoRecorderService videoRecorderService = VideoRecorderServiceProxy.getVideoRecorderService(getServlet().getServletContext());
+			
+			// create new comment
+	    	VideoRecorderComment comment;
+	    	
+			// get user
+			VideoRecorderUser user = videoRecorderService.getUserByUID(userId);
+			
+			// get recording
+			VideoRecorderRecording recording = videoRecorderService.getRecordingById(recordingId);
+			
+			// get session
+			VideoRecorderSession session = videoRecorderService.getSessionBySessionId(toolSessionId);
+			
+			// create a new comment
+			if(commentId == -1){
+				comment = new VideoRecorderComment();
+				comment.setCreateBy(user);
+				comment.setRecording(recording);
+				comment.setCreateDate(new Date());
+				comment.setText(commentText);
+				comment.setVideoRecorderSession(session);
+			}
+			// otherwise get the comment from the DAO
+			else{
+				comment = videoRecorderService.getCommentById(commentId);
+				comment.setText(commentText);
+			}
+			
+			// get comments from recording
+			Set<VideoRecorderComment> comments = recording.getComments();
+			
+			// add new comment to recording's comments
+			comments.add(comment);
+			
+			// save the recording
+			videoRecorderService.saveOrUpdateVideoRecorderRecording(recording);
+			
+			// refresh the recording object in order to get that last comment
+			recording = videoRecorderService.getRecordingById(recordingId);
+			
+			// get the comments from the recording and transform the set into a set of DTOs
+			Set<VideoRecorderCommentDTO> commentDTOs = VideoRecorderCommentDTO.getVideoRecorderCommentDTOs(recording.getComments());
+			
+			// return a response with all comments for current recording
+			response.setContentType("text/xml");
+			response.setCharacterEncoding("UTF-8");
+			writeAJAXResponse(response, buildVideoCommentsXML(commentDTOs));
+		}catch(Exception e){
+			writeAJAXResponse(response, ERROR_MSG + e.getMessage());
+		}
+		
+		return null;
+	}
+
+	public ActionForward saveRating(ActionMapping mapping,
+			ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) throws IOException, ServletException {
+		
+		try{
+			Long ratingId = WebUtil.readLongParam(request, RATING_ID);
+	    	Long recordingId = WebUtil.readLongParam(request, RECORDING_ID);
+	    	Long toolSessionId = WebUtil.readLongParam(request, TOOL_SESSION_ID);
+	    	Long userId = WebUtil.readLongParam(request, USER_ID);
+	    	float ratingFloat = Float.valueOf(WebUtil.readStrParam(request, RATING));
+	    	
+	    	// get service
+			IVideoRecorderService videoRecorderService = VideoRecorderServiceProxy.getVideoRecorderService(getServlet().getServletContext());
+			
+			// create new rating
+	    	VideoRecorderRating rating;
+	    	
+			// get user
+			VideoRecorderUser user = videoRecorderService.getUserByUID(userId);
+			
+			// get recording
+			VideoRecorderRecording recording = videoRecorderService.getRecordingById(recordingId);
+			
+			// get session
+			VideoRecorderSession session = videoRecorderService.getSessionBySessionId(toolSessionId);
+			
+			// create new rating
+			if(ratingId == -1){
+				rating = new VideoRecorderRating();
+				rating.setCreateBy(user);
+				rating.setRecording(recording);
+				rating.setCreateDate(new Date());
+				rating.setRating(ratingFloat);
+				rating.setVideoRecorderSession(session);
+			}
+			// otherwise get the rating from the DAO
+			else{
+				rating = videoRecorderService.getRatingById(ratingId);
+				rating.setRating(ratingFloat);
+			}
+			
+			// get ratings
+			Set<VideoRecorderRating> ratings = recording.getRatings();
+			
+			// add new rating
+			ratings.add(rating);
+			
+			// set the average rating through calculation
+			recording.setRating(calculateRating(ratings));
+			
+			// save recording with new rating
+			videoRecorderService.saveOrUpdateVideoRecorderRecording(recording);
+			
+			// refresh recording
+			recording = videoRecorderService.getRecordingById(recordingId);
+			
+			response.setContentType("text/xml");
+			response.setCharacterEncoding("UTF-8");
+			writeAJAXResponse(response, buildRatingResultXML(recording.getRating(), ratingFloat));
+		}catch(Exception e){
+			writeAJAXResponse(response, ERROR_MSG + e.getMessage());
+		}
+		
+		return null;
+	}
+	
+	public ActionForward getLanguageXML(ActionMapping mapping,
+			ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) throws IOException, ServletException {
+		// get service
+		try{
+			response.setContentType("text/xml");
+			response.setCharacterEncoding("UTF-8");
+			IVideoRecorderService videoRecorderService = VideoRecorderServiceProxy.getVideoRecorderService(getServlet().getServletContext());
+			writeAJAXResponse(response, videoRecorderService.getLanguageXML());
+		}catch(Exception e){
+			writeAJAXResponse(response, ERROR_MSG + e.getMessage());
+		}
+		
+		return null;
+
+	}
+
+	public ActionForward saveImage(ActionMapping mapping,
+			ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) throws IOException, ServletException {
+		try{		
+			String dir = WebUtil.readStrParam(request, DIR, true);
+			String filename = WebUtil.readStrParam(request, FILENAME);
+			String ext = WebUtil.readStrParam(request, EXTENSTION);
+			String data = WebUtil.readStrParam(request, IMAGEDATA);
+			Long toolSessionId = WebUtil.readLongParam(request, TOOL_SESSION_ID, true);
+			
+			IVideoRecorderService videoRecorderService = VideoRecorderServiceProxy.getVideoRecorderService(getServlet().getServletContext());
+
+			// if this is being added by a learner
+			if(toolSessionId != null){
+				VideoRecorderSession session = videoRecorderService.getSessionBySessionId(toolSessionId);
+				String folder = session.getContentFolderId();
+				dir = Configuration.get(ConfigurationKeys.LAMS_EAR_DIR) + File.separator + "lams-www.war" + File.separator + "secure" + File.separator + folder + File.separator + "previewImages" + File.separator;
+			}
+			
+			// at this point, the dir variable should contain a path to the learning design content folder (author)
+			// or a path to the session content folder (learner)
+			if(dir != null){
+				boolean success = Base64StringToImageUtil.create(dir, filename, ext, data);
+				writeAJAXResponse(response, String.valueOf(success));
+			}
+			else{
+				writeAJAXResponse(response, ERROR_MSG);
+			}
+		}catch(Exception e){
+			writeAJAXResponse(response, ERROR_MSG + e.getMessage());
+		}
+		
+		return null;
+
+	}
+	
+	public ActionForward getLanguageXMLForFCK(ActionMapping mapping,
+			ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) throws IOException, ServletException {
+		// get service
+		try{
+			IVideoRecorderService videoRecorderService = VideoRecorderServiceProxy.getVideoRecorderService(getServlet().getServletContext());
+			response.setContentType("text/xml");
+			response.setCharacterEncoding("UTF-8");
+			writeAJAXResponse(response, videoRecorderService.getLanguageXMLForFCK());
+		}catch(Exception e){
+			writeAJAXResponse(response, "");
+		}
+		
+		return null;
+
+	}
+	
+	private String buildVideoRecordingsXML(List<VideoRecorderRecordingDTO> videoRecorderRecordingDTOs, Long userId, String previewImageLearnerPath, String previewImageAuthorPath, String soundOnlyImage){
+		//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();
+			Set<VideoRecorderCommentDTO> comments = videoRecorderRecordingDTO.getComments();
+		    
+			Set<VideoRecorderRatingDTO> ratings = videoRecorderRecordingDTO.getRatings();
+			
+			xmlOutput += "<recording>";
+			xmlOutput += "<recordingId>" + videoRecorderRecordingDTO.getUid() + "</recordingId>";
+			xmlOutput += "<title>" + videoRecorderRecordingDTO.getTitle() + "</title>";
+			
+			// user stuff
+			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>";
+			xmlOutput += "<filename>" + videoRecorderRecordingDTO.getFilename() + FLV_EXTENSION + "</filename>";
+			
+			// preview image stuff
+			if(videoRecorderRecordingDTO.getIsJustSound()){
+				xmlOutput += "<previewImage>" + soundOnlyImage + "</previewImage>";
+			}else{
+				if(user != null){
+					xmlOutput += "<previewImage>" + previewImageLearnerPath + videoRecorderRecordingDTO.getFilename() + JPG_EXTENSION + "</previewImage>";
+				}
+				else if(user == null && videoRecorderRecordingDTO.getToolContentId() != -1){
+					xmlOutput += "<previewImage>" + previewImageAuthorPath + videoRecorderRecordingDTO.getFilename() + JPG_EXTENSION + "</previewImage>";
+				}
+			}
+			xmlOutput += "<rating>" + videoRecorderRecordingDTO.getRating() + "</rating>";
+			xmlOutput += "<userRating>" + buildUserRating(ratings, userId) + "</userRating>";
+			xmlOutput += "<isJustSound>" + videoRecorderRecordingDTO.getIsJustSound() + "</isJustSound>";
+			xmlOutput += "<isLocal>" + videoRecorderRecordingDTO.getIsLocal() + "</isLocal>";
+			
+			// for every recording, print out its comments
+			xmlOutput += buildVideoCommentsXML(comments);
+			xmlOutput += "</recording>";
+		}
+		
+		xmlOutput += "</recordings>";
+		return xmlOutput;
+	}
+	
+	private String buildVideoCommentsXML(Set<VideoRecorderCommentDTO> comments){
+		String xmlOutput = "<comments>";
+		
+		VideoRecorderCommentDTO[] commentArray = (VideoRecorderCommentDTO[])comments.toArray(new VideoRecorderCommentDTO[comments.size()]);
+
+		//for(VideoRecorderCommentDTO comment: comments){
+		for(int i = commentArray.length - 1; i >= 0; i--){
+			VideoRecorderCommentDTO comment = commentArray[i];
+			xmlOutput += "<comment>";
+			xmlOutput += "<author>" + comment.getCreateBy().getFirstName() + " " + comment.getCreateBy().getLastName() + "</author>";
+			xmlOutput += "<createDate>" + comment.getCreateDate().toLocaleString() + "</createDate>";
+			xmlOutput += "<text>" + comment.getText() + "</text>";
+			xmlOutput += "</comment>";
+		}
+		
+		xmlOutput += "</comments>";
+		
+		return xmlOutput;
+	}
+	
+	private String buildRatingResultXML(Float rating, Float userRating){
+		String xmlOutput = "<result>";
+		xmlOutput += "<rating>" + rating.toString() + "</rating>";
+		xmlOutput += "<userRating>" + userRating.toString() + "</userRating>";
+		xmlOutput += "</result>";
+		return xmlOutput;
+	}
+	
+	private String buildUserRating(Set<VideoRecorderRatingDTO> ratings, Long userId){
+		for(VideoRecorderRatingDTO rating: ratings){
+			if(rating.createBy.getUid().longValue() == userId.longValue()){
+				return "" + rating.rating;
+			}
+		}
+		return "-1";
+	}
+	
+	private float calculateRating(Set<VideoRecorderRating> ratings){
+		if(ratings.isEmpty() || ratings == null){
+			return 0;
+		}
+		else{
+			float totalRating = 0;
+			for(VideoRecorderRating rating: ratings){
+				totalRating += rating.getRating();
+			}
+			totalRating = totalRating / ratings.size();
+			
+			return totalRating;
+		}
+	}
+}
\ No newline at end of file
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/servlets/ExportServlet.java
===================================================================
diff -u -r61df3f3f473a3619f93c63ceb879ae36438020e8 -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/servlets/ExportServlet.java	(.../ExportServlet.java)	(revision 61df3f3f473a3619f93c63ceb879ae36438020e8)
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/servlets/ExportServlet.java	(.../ExportServlet.java)	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
@@ -91,8 +91,6 @@
 					.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,
@@ -258,7 +256,7 @@
 				.getAttribute(AttributeNames.USER);
 		
 		// get video recording dtos from just tool content id
-		List<VideoRecorderRecordingDTO> videoRecorderRecordingDTOs = videoRecorderService.getRecordingsByToolSessionId(new Long(0), toolContentID);
+		List<VideoRecorderRecordingDTO> videoRecorderRecordingDTOs = videoRecorderService.getRecordingsByToolSessionId(toolSessionID, toolContentID);
 		
 		// get nb of recordings
 		int nbRecordings = videoRecorderRecordingDTOs.size();
@@ -303,11 +301,14 @@
 		
 		// bundling files
 		try {
-			String[] urls = new String[1];
-			urls[0] = VIDEORECORDER_INCLUDES_HTTP_FOLDER_URL;
+			String[] srcDirs = new String[2];
+			srcDirs[0] = VIDEORECORDER_INCLUDES_HTTP_FOLDER_URL;
+
+			String[] targetDirs = new String[2];
+			targetDirs[0] = directoryName + File.separator + "files";
 			
 			MultipleDirFileBundler fileBundler = new MultipleDirFileBundler();
-		    fileBundler.bundle(request, cookies, directoryName, urls, fileArray);
+			fileBundler.bundle(request, cookies, srcDirs, targetDirs, fileArray);
 		} catch (Exception e) {
 			logger.error("Could not bundle files", e);
 		}
@@ -316,9 +317,7 @@
 	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
+		// prepare 
 		ArrayList<String>[] fileArray = new ArrayList[2];
 		fileArray[0] = new ArrayList<String>();
 		fileArray[1] = new ArrayList<String>();
@@ -336,48 +335,24 @@
 				// get the video recording
 				VideoRecorderRecordingDTO vr = (VideoRecorderRecordingDTO) iter.next();
 				
-				// success indicator
-				int success = 0;
-				
-				String absoluteFilePath = VIDEORECORDER_RECORDINGS_FOLDER_DEST + vr.getFilename() + FLV_EXTENSION;
-				
-				// fetch file locally
-				File f = new File(absoluteFilePath);
-
-				// if file doesn't exist locally
-				if(!f.exists()){
-					// create the file
-					f.createNewFile();
-					// fetch from server
-					success = HttpUrlConnectionUtil.writeResponseToFile(VIDEORECORDER_RECORDINGS_FOLDER_SRC + vr.getFilename() + FLV_EXTENSION, VIDEORECORDER_RECORDINGS_FOLDER_DEST, vr.getFilename() + FLV_EXTENSION, cookies);
-				}
-				// if it does exists
-				else{
-					// w00t
-					success = 1;
-				}
-			    
-				// if we have a file
-			    if(success == 1){
-				    // add the filename to the list
-				    fileArray[1].add(vr.getFilename() + FLV_EXTENSION);
-				    logger.debug("file copy complete");
-			    }else{
-			    	logger.debug("file copy failed");
-			    }
+				fileArray[1].add(vr.getFilename() + FLV_EXTENSION);
 		    }
 		} catch (Exception e) {
 			logger.error("Could not find files on Red5 server", e);
 		}
 
 		// bundling files
 		try {
-			String[] urls = new String[2];
-			urls[0] = VIDEORECORDER_INCLUDES_HTTP_FOLDER_URL;
-			urls[1] = VIDEORECORDER_RECORDINGS_HTTP_FOLDER_URL;
+			String[] srcDirs = new String[2];
+			srcDirs[0] = VIDEORECORDER_INCLUDES_HTTP_FOLDER_URL;
+			srcDirs[1] = VIDEORECORDER_RECORDINGS_FOLDER_SRC;
+
+			String[] targetDirs = new String[2];
+			targetDirs[0] = directoryName + File.separator + "files";
+			targetDirs[1] = directoryName + File.separator + "files";
 			
 			MultipleDirFileBundler fileBundler = new MultipleDirFileBundler();
-		    fileBundler.bundle(request, cookies, directoryName, urls, fileArray);
+		    fileBundler.bundle(request, cookies, srcDirs, targetDirs, fileArray);
 		} catch (Exception e) {
 			logger.error("Could not bundle files", e);
 		}
Fisheye: Tag f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/servlets/VideoRecorderAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_videorecorder/web/images/soundOnly.png
===================================================================
diff -u
Binary files differ
Index: lams_tool_videorecorder/web/includes/flash/VideoRecorder.swf
===================================================================
diff -u -r0bbad8932a51efb88ac79f78bf2c7d7396554fe9 -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82
Binary files differ
Index: lams_tool_videorecorder/web/includes/flash/VideoRecorderFCKEditor.swf
===================================================================
diff -u -r0bbad8932a51efb88ac79f78bf2c7d7396554fe9 -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82
Binary files differ
Index: lams_tool_videorecorder/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r3d081de4a45da632ee6029251318fac795d41813 -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82
--- lams_tool_videorecorder/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 3d081de4a45da632ee6029251318fac795d41813)
+++ lams_tool_videorecorder/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
@@ -24,7 +24,6 @@
 			<c:if test="${sessionMap.mode == 'author'}">
 				<lams:Tab id="2" key="button.advanced" />
 				<lams:Tab id="3" key="button.instructions" />
-				<lams:Tab id="4" key="button.conditions" />
 			</c:if>
 		</lams:Tabs>
 
@@ -58,8 +57,6 @@
 			<lams:TabBody id="2" titleKey="button.advanced" page="advanced.jsp" />
 			<lams:TabBody id="3" titleKey="button.instructions"
 				page="instructions.jsp" />
-			<lams:TabBody id="4" titleKey="button.conditions"
-				page="conditions.jsp" />
 		</c:if>
 
 		<lams:AuthoringButton formID="authoringForm"
Index: lams_tool_videorecorder/web/pages/authoring/basic.jsp
===================================================================
diff -u -r01f1d853607cc14f73aa2429275084f4890f92b7 -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82
--- lams_tool_videorecorder/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 01f1d853607cc14f73aa2429275084f4890f92b7)
+++ lams_tool_videorecorder/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
@@ -1,6 +1,5 @@
 <%@ 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"
@@ -10,20 +9,7 @@
 <c:set var="dto" value="${videoRecorderDTO}" />
 
 <script src="<lams:LAMSURL/>includes/javascript/AC_OETags.js" type="text/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>
@@ -46,8 +32,15 @@
 	</tr>
 	<tr align="center">
 		<td>
-			<script language="JavaScript" type="text/javascript">
-			<!--
+			<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;
+			
 			// Version check for the Flash Player that has the ability to start Player Product Install (6.0r65)
 			var hasProductInstall = DetectFlashVer(6, 0, 65);
 			
@@ -81,7 +74,18 @@
 				// 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}"+"",
+						"FlashVars", "mode=recorderModeAuthor" +
+										'&offlinePlayback='+'${videoRecorderRecordingDTO.isLocal}' +
+										'&red5ServerUrl=<%= Configuration.get(ConfigurationKeys.RED5_SERVER_URL) %>' +
+										'&serverUrl=<%= Configuration.get(ConfigurationKeys.SERVER_URL) %>' +
+										'&red5RecordingsUrl=<%= Configuration.get(ConfigurationKeys.RED5_RECORDINGS_URL) %>' +
+										'&lamsEarDir=<%= Configuration.get(ConfigurationKeys.LAMS_EAR_DIR) %>' +
+										'&saveToLamsDestUrl=/lams-www.war/secure/${sessionMap.contentFolderID}/Recordings/' +
+										'&contentFolderUrl=/lams//www/secure/${sessionMap.contentFolderID}/Recordings/' +
+										'&filename='+'${videoRecorderRecordingDTO.filename}'+'.flv' +
+										'&toolContentId='+${toolContentId} +
+										'&languageXML='+"${languageXML}" +
+										"",
 						"width", "361",
 						"height", "331",
 						"align", "middle",
@@ -99,7 +103,6 @@
 			   	+ '<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"
Index: lams_tool_videorecorder/web/pages/authoring/headItems.jsp
===================================================================
diff -u -r3d081de4a45da632ee6029251318fac795d41813 -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82
--- lams_tool_videorecorder/web/pages/authoring/headItems.jsp	(.../headItems.jsp)	(revision 3d081de4a45da632ee6029251318fac795d41813)
+++ lams_tool_videorecorder/web/pages/authoring/headItems.jsp	(.../headItems.jsp)	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
@@ -1,3 +1,5 @@
+<%@ page import="org.lamsfoundation.lams.util.Configuration" %>
+<%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %>
 <%@ include file="/common/taglibs.jsp"%>
 <c:set var="lams">
 	<lams:LAMSURL />
@@ -6,5 +8,16 @@
 	<lams:WebAppURL />
 </c:set>
 
+<%
+	String red5Url = Configuration.get(ConfigurationKeys.RED5_SERVER_URL);
+	String red5RecordingsUrl = Configuration.get(ConfigurationKeys.RED5_RECORDINGS_URL);
+%>
+
+<c:if test='<%= red5Url.equals("")  || red5RecordingsUrl.equals("") %>'>
+	<script type="text/javascript">	
+		alert("<fmt:message key='videorecorder.error.noconfig'/>");
+	</script>
+</c:if>
+	
 <script type="text/javascript" src="${tool}includes/javascript/authoring.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/prototype.js"></script>
Index: lams_tool_videorecorder/web/pages/export/exportPortfolio.jsp
===================================================================
diff -u -r61df3f3f473a3619f93c63ceb879ae36438020e8 -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82
--- lams_tool_videorecorder/web/pages/export/exportPortfolio.jsp	(.../exportPortfolio.jsp)	(revision 61df3f3f473a3619f93c63ceb879ae36438020e8)
+++ lams_tool_videorecorder/web/pages/export/exportPortfolio.jsp	(.../exportPortfolio.jsp)	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
@@ -111,10 +111,10 @@
 												"src", "./files/VideoRecorderFCKEditor",
 												<c:choose>
 												<c:when test="${videoRecorderDTO.exportOffline == true}">
-													"FlashVars", "&mode="+'playerModeOffline'+'&red5ServerUrl='+'${red5ServerUrl}'+'&serverUrl='+'${serverUrl}'+'&filename='+'${recording.filename}'+'.flv'+'&languageXML='+"${languageXML}"+"",
+													"FlashVars", "&mode="+'playerModeOffline' + '&offlinePlayback=false' + '&red5ServerUrl='+'${red5ServerUrl}' + '&serverUrl='+'${serverUrl}' + '&filename='+'${recording.filename}'+'.flv' + '&languageXML=' + "${languageXML}"+"",
 												</c:when>
 												<c:otherwise>
-													"FlashVars", "&mode="+'playerModeOnline'+'&red5ServerUrl='+'${red5ServerUrl}'+'&serverUrl='+'${serverUrl}'+'&filename='+'${recording.filename}'+'.flv'+'&languageXML='+"${languageXML}"+"",
+													"FlashVars", "&mode="+'playerModeOnline' + '&offlinePlayback=true' + '&red5ServerUrl='+'${red5ServerUrl}' + '&serverUrl='+'${serverUrl}' + '&filename='+'${recording.filename}'+'.flv' + '&languageXML=' + "${languageXML}"+"",
 												</c:otherwise>
 												</c:choose>											
 												"width", "361",
Index: lams_tool_videorecorder/web/pages/learning/videoRecorder.jsp
===================================================================
diff -u -r0bbad8932a51efb88ac79f78bf2c7d7396554fe9 -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82
--- lams_tool_videorecorder/web/pages/learning/videoRecorder.jsp	(.../videoRecorder.jsp)	(revision 0bbad8932a51efb88ac79f78bf2c7d7396554fe9)
+++ lams_tool_videorecorder/web/pages/learning/videoRecorder.jsp	(.../videoRecorder.jsp)	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
@@ -1,4 +1,18 @@
+<%@ page import="org.lamsfoundation.lams.util.Configuration" %>
+<%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %>
 <%@ include file="/common/taglibs.jsp"%>
+
+<%
+	String red5Url = Configuration.get(ConfigurationKeys.RED5_SERVER_URL);
+	String red5RecordingsUrl = Configuration.get(ConfigurationKeys.RED5_RECORDINGS_URL);
+%>
+
+<c:if test='<%= red5Url.equals("")  || red5RecordingsUrl.equals("") %>'>
+	<script type="text/javascript">	
+		alert("<fmt:message key='videorecorder.error.noconfig'/>");
+	</script>
+</c:if>
+
 <c:set var="formBean"value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 <script src="<lams:LAMSURL/>includes/javascript/AC_OETags.js" type="text/javascript"></script>
 <script type="text/javascript">
@@ -111,7 +125,21 @@
 			// embed the Flash Content SWF when all tests are passed
 			AC_FL_RunContent(
 					"src", "./includes/flash/VideoRecorder",
-					"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}"+"",
+					"FlashVars", "contentEditable="+${contentEditable} +
+									'&contentFolderUrl=/lams//www/secure/${contentFolderId}/Recordings/' +
+									'&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",
Index: lams_tool_videorecorder/web/pages/monitoring/headItems.jsp
===================================================================
diff -u -r3d081de4a45da632ee6029251318fac795d41813 -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82
--- lams_tool_videorecorder/web/pages/monitoring/headItems.jsp	(.../headItems.jsp)	(revision 3d081de4a45da632ee6029251318fac795d41813)
+++ lams_tool_videorecorder/web/pages/monitoring/headItems.jsp	(.../headItems.jsp)	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
@@ -1,9 +1,22 @@
+<%@ page import="org.lamsfoundation.lams.util.Configuration" %>
+<%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %>
 <%@ include file="/common/taglibs.jsp"%>
 
 <c:set var="tool">
 	<lams:WebAppURL />
 </c:set>
 
+<%
+	String red5Url = Configuration.get(ConfigurationKeys.RED5_SERVER_URL);
+	String red5RecordingsUrl = Configuration.get(ConfigurationKeys.RED5_RECORDINGS_URL);
+%>
+
+<c:if test='<%= red5Url.equals("")  || red5RecordingsUrl.equals("") %>'>
+	<script type="text/javascript">	
+		alert("<fmt:message key='videorecorder.error.noconfig'/>");
+	</script>
+</c:if>
+
 <script type="text/javascript"
 	src="${tool}includes/javascript/monitoring.js">
 </script>
Index: lams_tool_videorecorder/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r61df3f3f473a3619f93c63ceb879ae36438020e8 -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82
--- lams_tool_videorecorder/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 61df3f3f473a3619f93c63ceb879ae36438020e8)
+++ lams_tool_videorecorder/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
@@ -1,3 +1,5 @@
+<%@ page import="org.lamsfoundation.lams.util.Configuration" %>
+<%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %>
 <%@ include file="/common/taglibs.jsp"%>
 <script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
 <script src="<lams:LAMSURL/>includes/javascript/AC_OETags.js" type="text/javascript"></script>
@@ -210,7 +212,21 @@
 		// embed the Flash Content SWF when all tests are passed
 		AC_FL_RunContent(
 				"src", "./includes/flash/VideoRecorder",
-				"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}"+"",
+				"FlashVars", "contentEditable="+${contentEditable} +
+								'&contentFolderUrl=/lams//www/secure/${contentFolderID}/Recordings/' +
+								'&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",