Index: lams_admin/conf/xdoclet/struts-forms.xml
===================================================================
diff -u -r430f979ac0574e45242bd6e3df353d8592276121 -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_admin/conf/xdoclet/struts-forms.xml	(.../struts-forms.xml)	(revision 430f979ac0574e45242bd6e3df353d8592276121)
+++ lams_admin/conf/xdoclet/struts-forms.xml	(.../struts-forms.xml)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -49,7 +49,6 @@
 	<form-property name="tutorialsDisabled" type="java.lang.Boolean" initial="false" />
 	<form-property name="firstLogin" type="java.lang.Boolean" initial="true" />
 	<form-property name="timeZone" type="java.lang.String" />
-	<form-property name="enableFlash" type="java.lang.Boolean" />	
 	<form-property name="userCSSTheme" type="java.lang.Long" />
 	<form-property name="userFlashTheme" type="java.lang.Long" />
 </form-bean>
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java
===================================================================
diff -u -rba24244d8d8029b2673232988f58c6a97672e17e -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java	(.../ImportService.java)	(revision ba24244d8d8029b2673232988f58c6a97672e17e)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java	(.../ImportService.java)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -582,7 +582,6 @@
 		user.setTimeZone(user.getTimeZone());
 		user.setTutorialsDisabled(false);
 		user.setFirstLogin(true);
-		user.setEnableFlash(Configuration.getAsBoolean(ConfigurationKeys.FLASH_ENABLE));
 		
 		return (hasError ? null : user);
 	}
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_admin/web/WEB-INF/tags/Passon.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_admin/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_admin/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_admin/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -28,26 +28,6 @@
    </tag>
    <tag>
 
-      <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-      <display-name>generate unique ID</display-name>
-      <icon>    
-      </icon>
-      <name>generateID</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.GenerateIDTag</tag-class>
-      <body-content>empty</body-content>
-
-      <attribute>
-         <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-         <name>id</name>
-         <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-
-   </tag>
-   <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
@@ -191,17 +171,6 @@
    </tag>
    <tag>
 
-      <description>Checks whether Flash enabled for learner</description>
-      <display-name>Checks whether Flash enabled for learner</display-name>
-      <icon>    
-      </icon>
-      <name>LearnerFlashEnabled</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-      <body-content>empty</body-content>
-
-   </tag>
-   <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -304,6 +273,11 @@
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
+			<name>index</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
 			<name>indexed</name>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
@@ -456,12 +430,8 @@
    	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
-   	</tag-file>   	
+   	</tag-file>
    	<tag-file>
-       <name>Passon</name>
-       <path>/WEB-INF/tags/Passon.tag</path>
-   	</tag-file>  
-   	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
    	</tag-file>  
@@ -507,15 +477,6 @@
         <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
-  	<tag>
-	  	<description>Checks whether Flash enabled for learner</description>
-	  	<display-name>Checks whether Flash enabled for learner</display-name>
-	 	<icon>    
-	 	</icon>
-	 	<name>LearnerFlashEnabled</name>
-	 	<tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-	 	<body-content>empty</body-content>
- 	</tag> 
 	<tag-file>
 		<name>head</name>
 	    <path>/WEB-INF/tags/Head.tag</path>
Index: lams_admin/web/user.jsp
===================================================================
diff -u -r862d181bb03e2bbaaf0a9e98c3877a0aff84fdf9 -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_admin/web/user.jsp	(.../user.jsp)	(revision 862d181bb03e2bbaaf0a9e98c3877a0aff84fdf9)
+++ lams_admin/web/user.jsp	(.../user.jsp)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -1,5 +1,4 @@
 <%@ include file="/taglibs.jsp"%>
-<%@ page import="org.lamsfoundation.lams.util.Configuration" import="org.lamsfoundation.lams.util.ConfigurationKeys" %>
 
 <html-el:form action="/usersave.do" method="post">
 <html-el:hidden property="userId" />
@@ -118,25 +117,8 @@
 				<tr>
 					<td class="align-right"><fmt:message key="admin.user.fax"/>:</td>
 					<td><html-el:text property="fax" size="50" maxlength="64" /></td>
-				</tr>
+				</tr>					
 				
-				<c:set var="serverFlashEnabled"><%=Configuration.get(ConfigurationKeys.FLASH_ENABLE)%></c:set>
-				<c:choose>
-					<c:when test="${serverFlashEnabled}"> 
-						<tr>
-							<td class="align-right"><fmt:message key="admin.user.enable.flash.for.learner.window"/>:</td>
-							<td><html:select property="enableFlash">
-								<html:option value="true"><fmt:message key="label.yes"/></html:option>
-								<html:option value="false"><fmt:message key="label.no"/></html:option>
-								</html:select>
-							</td>
-						</tr>
-					</c:when>
-					<c:otherwise>
-						<html:hidden property="enableFlash" />
-					</c:otherwise>
-				</c:choose>				
-				
 				<tr>
 					<td class="align-right"><fmt:message key="admin.organisation.locale"/>:</td>
 					<td>
Index: lams_build/build.xml
===================================================================
diff -u -rf964c1062c52d93be83ace1aa252b45deff63d5e -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_build/build.xml	(.../build.xml)	(revision f964c1062c52d93be83ace1aa252b45deff63d5e)
+++ lams_build/build.xml	(.../build.xml)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -97,6 +97,7 @@
 		<ant antfile="../${lams_admin}/build.xml"             target="copy-tags" inheritAll="false"/>
 		<ant antfile="../${lams_learning}/build.xml"          target="copy-tags" inheritAll="false"/>
 		<ant antfile="../${lams_monitoring}/build.xml"        target="copy-tags" inheritAll="false"/>
+		<ant antfile="../${lams_gradebook}/build.xml"         target="copy-tags" inheritAll="false"/>
 		<ant antfile="../${lams_www}/build.xml"               target="copy-tags" inheritAll="false"/>
 		<ant antfile="../${tool_assessment_dir}/build.xml"    target="copy-tags" inheritAll="false"/>
 		<ant antfile="../${tool_chat_dir}/build.xml"          target="copy-tags" inheritAll="false"/>
@@ -122,6 +123,7 @@
         <ant antfile="../${tool_wookie_dir}/build.xml"        target="copy-tags" inheritAll="false"/>
         <ant antfile="../${tool_imscc_dir}/build.xml"         target="copy-tags" inheritAll="false"/>
         <ant antfile="../${tool_bbb_dir}/build.xml"           target="copy-tags" inheritAll="false"/>
+		<ant antfile="../${tool_mindmap_dir}/build.xml"           target="copy-tags" inheritAll="false"/>
 	</target>
 
 	
Index: lams_build/lib/lams/lams-central.jar
===================================================================
diff -u -rdc7b67e7677c8cd2289130c67094a62b39177d05 -r606581007abbdaee5483777096f32ffac1c3e3eb
Binary files differ
Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -rcc5ac6445941cdeeb5fd2440621630496e9f81e1 -r606581007abbdaee5483777096f32ffac1c3e3eb
Binary files differ
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/ar_JO_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/ca_ES_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/cs_CZ_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/cy_GB_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/da_DK_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/de_DE_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/el_GR_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/en_AU_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/en_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/es_ES_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/es_MX_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/fr_FR_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/hu_HU_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/it_IT_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/ja_JP_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/ko_KR_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/mi_NZ_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/ms_MY_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/nl_BE_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/no_NO_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/pl_PL_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/pt_BR_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/ru_RU_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/sl_SI_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/sv_SE_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/tr_TR_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/vi_VN_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/zh_CN_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/zh_TW_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/wizard/ar_JO_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/wizard/cy_GB_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/wizard/da_DK_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/wizard/de_DE_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/wizard/el_GR_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/wizard/en_AU_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/wizard/en_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/wizard/es_ES_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/wizard/fr_FR_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/wizard/hu_HU_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/wizard/it_IT_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/wizard/ja_JP_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/wizard/ko_KR_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/wizard/mi_NZ_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/wizard/ms_MY_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/wizard/nl_BE_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/wizard/no_NO_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/wizard/pl_PL_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/wizard/pt_BR_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/wizard/ru_RU_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/wizard/sv_SE_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/wizard/tr_TR_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/wizard/vi_VN_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/wizard/zh_CN_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/wizard/zh_TW_dictionary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -raf5130ddec364ee2a42e8856d6e66f2650563f7a -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision af5130ddec364ee2a42e8856d6e66f2650563f7a)
+++ lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -192,7 +192,6 @@
 label.show.groups  =Show Groups
 label.forgot.password  =Forgot your password?
 button.select.importfile  =Select File To Import
-label.enable.flash  =Enable Flash for Learner Window
 label.yes  =Yes
 label.no  =No
 label.ok  =OK
Index: lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java
===================================================================
diff -u -r2e6d6e416cc36e920e3900118324d5d310213135 -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java	(.../HomeAction.java)	(revision 2e6d6e416cc36e920e3900118324d5d310213135)
+++ lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java	(.../HomeAction.java)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -87,7 +87,6 @@
  * 
  * @struts:action path="/home" validate="false" parameter="method"
  * @struts:action-forward name="sysadmin" path="/sysadmin.jsp"
- * @struts:action-forward name="learner" path="/learner.jsp"
  * @struts:action-forward name="lessonIntro" path="/lessonIntro.jsp"
  * @struts:action-forward name="author" path="/author.jsp"
  * @struts:action-forward name="addLesson" path="/addLesson.jsp"
@@ -184,26 +183,30 @@
 		    return displayMessage(mapping, req, "error.lesson.not.accessible.for.learners");
 		}
 
+		String learnerURL = Configuration.get(ConfigurationKeys.SERVER_URL) + "learning/main.jsp";
+
 		if (mode != null) {
-		    req.setAttribute(AttributeNames.PARAM_MODE, mode);
+		    learnerURL = WebUtil.appendParameterToURL(learnerURL, AttributeNames.PARAM_MODE, mode);
 		}
 
-		req.setAttribute(AttributeNames.PARAM_EXPORT_PORTFOLIO_ENABLED,
-			lesson.getLearnerExportAvailable() != null ? lesson.getLearnerExportAvailable() : Boolean.TRUE);
-		req.setAttribute(AttributeNames.PARAM_PRESENCE_ENABLED, lesson.getLearnerPresenceAvailable());
-		req.setAttribute(AttributeNames.PARAM_PRESENCE_IM_ENABLED, lesson.getLearnerImAvailable());
-		req.setAttribute(AttributeNames.PARAM_TITLE, lesson.getLessonName());
+		learnerURL = WebUtil.appendParameterToURL(learnerURL, AttributeNames.PARAM_EXPORT_PORTFOLIO_ENABLED, String
+			.valueOf(lesson.getLearnerExportAvailable() != null ? lesson.getLearnerExportAvailable()
+				: Boolean.TRUE));
+		learnerURL = WebUtil.appendParameterToURL(learnerURL, AttributeNames.PARAM_PRESENCE_ENABLED,
+			String.valueOf(lesson.getLearnerPresenceAvailable()));
+		learnerURL = WebUtil.appendParameterToURL(learnerURL, AttributeNames.PARAM_PRESENCE_IM_ENABLED,
+			String.valueOf(lesson.getLearnerImAvailable()));
+		learnerURL = WebUtil.appendParameterToURL(learnerURL, AttributeNames.PARAM_TITLE, lesson.getLessonName());
 
 		/* Date Format for Chat room append */
 		DateFormat sfm = new SimpleDateFormat("yyyyMMdd_HHmmss");
-		req.setAttribute(AttributeNames.PARAM_CREATE_DATE_TIME, sfm.format(lesson.getCreateDateTime()));
+		learnerURL = WebUtil.appendParameterToURL(learnerURL, AttributeNames.PARAM_CREATE_DATE_TIME,
+			sfm.format(lesson.getCreateDateTime()));
+		learnerURL = WebUtil.appendParameterToURL(learnerURL, AttributeNames.PARAM_LESSON_ID, String.valueOf(lessonId));
 
-		String serverUrl = Configuration.get(ConfigurationKeys.SERVER_URL);
-		req.setAttribute("serverUrl", serverUrl);
-		req.setAttribute(AttributeNames.PARAM_LESSON_ID, lessonId);
-
 		// show lesson intro page if required
 		if (lesson.isEnableLessonIntro()) {
+		    req.setAttribute("learnerURL", learnerURL);
 		    req.setAttribute("lesson", lesson);
 		    req.setAttribute("displayDesignImage", lesson.isDisplayDesignImage());
 		    req.setAttribute("isMonitor", lesson.getLessonClass().isStaffMember(getRealUser(user)));
@@ -223,9 +226,9 @@
 		    }
 		    return mapping.findForward("lessonIntro");
 		} else {
-		    return mapping.findForward("learner");
+		    res.sendRedirect(learnerURL);
+		    return null;
 		}
-
 	    }
 
 	} catch (Exception e) {
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/web/tag/GenerateIDTag.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/web/tag/LearnerFlashEnabledTag.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/web/WEB-INF/tags/Passon.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rfc7e9d5382464db874acd265db7ec003c9472d12 -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_central/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision fc7e9d5382464db874acd265db7ec003c9472d12)
+++ lams_central/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -28,26 +28,6 @@
    </tag>
    <tag>
 
-      <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-      <display-name>generate unique ID</display-name>
-      <icon>    
-      </icon>
-      <name>generateID</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.GenerateIDTag</tag-class>
-      <body-content>empty</body-content>
-
-      <attribute>
-         <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-         <name>id</name>
-         <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-
-   </tag>
-   <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
@@ -191,17 +171,6 @@
    </tag>
    <tag>
 
-      <description>Checks whether Flash enabled for learner</description>
-      <display-name>Checks whether Flash enabled for learner</display-name>
-      <icon>    
-      </icon>
-      <name>LearnerFlashEnabled</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-      <body-content>empty</body-content>
-
-   </tag>
-   <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -461,12 +430,8 @@
    	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
-   	</tag-file>   	
+   	</tag-file>
    	<tag-file>
-       <name>Passon</name>
-       <path>/WEB-INF/tags/Passon.tag</path>
-   	</tag-file>  
-   	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
    	</tag-file>  
@@ -512,15 +477,6 @@
         <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
-  	<tag>
-	  	<description>Checks whether Flash enabled for learner</description>
-	  	<display-name>Checks whether Flash enabled for learner</display-name>
-	 	<icon>    
-	 	</icon>
-	 	<name>LearnerFlashEnabled</name>
-	 	<tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-	 	<body-content>empty</body-content>
- 	</tag> 
 	<tag-file>
 		<name>head</name>
 	    <path>/WEB-INF/tags/Head.tag</path>
Index: lams_central/web/editprofile.jsp
===================================================================
diff -u -r3480d4f851a1f828386c7921ad5901b6048ee1d3 -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_central/web/editprofile.jsp	(.../editprofile.jsp)	(revision 3480d4f851a1f828386c7921ad5901b6048ee1d3)
+++ lams_central/web/editprofile.jsp	(.../editprofile.jsp)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -18,7 +18,6 @@
 	<p class="warning"><html:errors/></p>
 </logic:messagesPresent>
 
-<c:set var="serverFlashEnabled"><%=Configuration.get(ConfigurationKeys.FLASH_ENABLE)%></c:set>
 <c:set var="profileEditEnabled"><%=Configuration.get(ConfigurationKeys.PROFILE_EDIT_ENABLE)%></c:set>
 <c:set var="partialProfileEditEnabled"><%=Configuration.get(ConfigurationKeys.PROFILE_PARTIAL_EDIT_ENABLE)%></c:set>
 
@@ -110,21 +109,6 @@
 		<td class="align-right"><fmt:message key="label.fax"/>:</td>
 		<td><html:text property="fax" size="50" maxlength="64" disabled="${!profileEditEnabled and !partialProfileEditEnabled}" /></td>
 	</tr>
-	<c:choose>
-		<c:when test="${serverFlashEnabled}"> 
-			<tr>
-			<td class="align-right"><fmt:message key="label.enable.flash"/>:</td>
-			<td><html:select property="enableFlash" disabled="${!profileEditEnabled}" >
-				<html:option value="true"><fmt:message key="label.yes"/></html:option>
-				<html:option value="false"><fmt:message key="label.no"/></html:option>
-				</html:select>
-			</td>
-			</tr>
-		</c:when>
-		<c:otherwise>
-			<html:hidden property="enableFlash" />
-		</c:otherwise>
-	</c:choose>
 		
 	<tr>
 		<td class="align-right"><fmt:message key="label.language"/>:</td>
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_central/web/learner.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/web/lessonIntro.jsp
===================================================================
diff -u -rc0ae190cb1f4081bcf86fa46b07d1cbbd43ce250 -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_central/web/lessonIntro.jsp	(.../lessonIntro.jsp)	(revision c0ae190cb1f4081bcf86fa46b07d1cbbd43ce250)
+++ lams_central/web/lessonIntro.jsp	(.../lessonIntro.jsp)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -7,7 +7,6 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-html" prefix="html" %>
 <c:set var="lams" ><lams:LAMSURL/></c:set>
-<c:set var="startLessonParams">mode=${mode}&portfolioEnabled=${portfolioEnabled}&presenceEnabledPatch=${presenceEnabledPatch}&presenceImEnabled=${presenceImEnabled}&title=${title}&createDateTime=${createDateTime}&serverUrl=${serverUrl}&lessonID=${lessonID}</c:set>
 <c:set var="pngImageSrc" value="${lams}www/secure/learning-design-images/${learningDesignID}.png" />
 <c:set var="svgImageSrc" value="${lams}www/secure/learning-design-images/${learningDesignID}.svg" />
 
@@ -39,7 +38,7 @@
 		
 		<c:if test="${isMonitor}">
 			 <div class="float-right small-space-top">
-			 	<a class="thickbox button" href="editLessonIntro.do?method=edit&lessonID=${lessonID}&KeepThis=true&TB_iframe=true&height=600&width=850" title="<fmt:message key='label.edit'/>">
+			 	<a class="thickbox button" href="editLessonIntro.do?method=edit&lessonID=${lesson.lessonId}&KeepThis=true&TB_iframe=true&height=600&width=850" title="<fmt:message key='label.edit'/>">
 					<fmt:message key="label.edit"/>
 				</a>
 			</div>
@@ -61,7 +60,7 @@
 		</c:if>
 			
 		<div class="space-bottom-top align-right">
-			<html:link href="learner.jsp?${startLessonParams}" styleClass="button">
+			<html:link href="${learnerURL}" styleClass="button">
 				<span class="nextActivity"><fmt:message key="label.start.lesson" /></span>
 			</html:link>
 		</div>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml
===================================================================
diff -u -r009fbce36f45d0929f8007c4bbc798242f57d3af -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml	(.../User.hbm.xml)	(revision 009fbce36f45d0929f8007c4bbc798242f57d3af)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml	(.../User.hbm.xml)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -292,19 +292,6 @@
             length="255"
         </meta>    
     </property>
-
-    <property
-        name="enableFlash"
-        type="java.lang.Boolean"
-        column="enable_flash"
-        length="1"
-    >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="enable_flash"
-            length="1"
-        </meta>    
-    </property>
     
     <!-- Associations -->
   
Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040019.sql
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040019.sql	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040019.sql	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -0,0 +1,13 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+
+SET AUTOCOMMIT = 0;
+SET FOREIGN_KEY_CHECKS=0;
+
+DELETE FROM lams_configuration WHERE config_key = 'EnableFlash'
+                                  OR config_key = 'ForceMobileDevToUseFlashless';
+ALTER TABLE lams_user DROP COLUMN enable_flash;
+
+-- If there were no errors, commit and restore autocommit to on
+SET FOREIGN_KEY_CHECKS=0;
+COMMIT;
+SET AUTOCOMMIT = 1;
Index: lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java
===================================================================
diff -u -r0c8690c0ea9d545ef75c3f0391de11794e6ebfc9 -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java	(.../IntegrationService.java)	(revision 0c8690c0ea9d545ef75c3f0391de11794e6ebfc9)
+++ lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java	(.../IntegrationService.java)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -305,7 +305,6 @@
 	user.setCreateDate(new Date());
 	user.setDisabledFlag(false);
 	user.setLocale(LanguageUtil.getSupportedLocale(userData[13], userData[12]));
-	user.setEnableFlash(Configuration.getAsBoolean(ConfigurationKeys.FLASH_ENABLE));
 	user.setFlashTheme(service.getDefaultFlashTheme());
 	user.setHtmlTheme(service.getDefaultHtmlTheme());
 	service.save(user);
Index: lams_common/src/java/org/lamsfoundation/lams/signup/service/SignupService.java
===================================================================
diff -u -r2b88dada3266a4b0f83f4b5c4cf617553496ca59 -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_common/src/java/org/lamsfoundation/lams/signup/service/SignupService.java	(.../SignupService.java)	(revision 2b88dada3266a4b0f83f4b5c4cf617553496ca59)
+++ lams_common/src/java/org/lamsfoundation/lams/signup/service/SignupService.java	(.../SignupService.java)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -38,7 +38,6 @@
 	user.setAuthenticationMethod(getAuthenticationMethod(AuthenticationMethod.DB));
 	user.setLocale(getDefaultLocale());
 	user.setCreateDate(new Date());
-	user.setEnableFlash(true);
 	userManagementService.save(user);
 
 	// add to org
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java
===================================================================
diff -u -ree6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8 -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	(.../User.java)	(revision ee6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	(.../User.java)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -151,9 +151,6 @@
     private Boolean changePassword;
 
     /** persistent field */
-    private Boolean enableFlash;
-
-    /** persistent field */
     private String lamsCommunityToken;
 
     /** persistent field */
@@ -170,9 +167,9 @@
 
     /** persistent field - for Pedagogical Planner */
     private Set<Long> recentlyModifiedLearningDesigns = new LinkedHashSet<Long>();
-    
+
     private Date modifiedDate;
-    
+
     /** persistent field */
     private String openidURL;
 
@@ -447,6 +444,7 @@
 	return new EqualsBuilder().append(this.getUserId(), castOther.getUserId()).isEquals();
     }
 
+    @Override
     public int compareTo(Object user) {
 	User u = (User) user;
 	return login.compareTo(u.getLogin());
@@ -479,17 +477,17 @@
 
 	TimeZone timeZone = TimeZone.getTimeZone(getTimeZone());
 
-	Set<String> tutorialPages = pagesWithDisabledTutorials == null || pagesWithDisabledTutorials.isEmpty() ? null
+	Set<String> tutorialPages = (pagesWithDisabledTutorials == null) || pagesWithDisabledTutorials.isEmpty() ? null
 		: pagesWithDisabledTutorials;
 
 	return new UserDTO(userId, firstName, lastName, login, languageIsoCode, countryIsoCode, direction, email,
 		new CSSThemeBriefDTO(flashTheme), new CSSThemeBriefDTO(htmlTheme),
 		// TimeZone.getTimeZone("Australia/Sydney"),
-		timeZone, authenticationMethod.getAuthenticationMethodId(), fckLanguageMapping, enableFlash,
-		lamsCommunityToken, lamsCommunityUsername,
-		(tutorialsDisabled == null ? false : true),  // assume tutorials enabled if not set 
-		tutorialPages, 
-		(firstLogin == null ? true : false)  // assume no firstLogin value means they haven't logged in
+		timeZone, authenticationMethod.getAuthenticationMethodId(), fckLanguageMapping, lamsCommunityToken,
+		lamsCommunityUsername, (tutorialsDisabled == null ? false : true), // assume tutorials enabled if not
+										   // set
+		tutorialPages, (firstLogin == null ? true : false) // assume no firstLogin value means they haven't
+								   // logged in
 	);
     }
 
@@ -578,14 +576,6 @@
 	this.changePassword = changePassword;
     }
 
-    public Boolean getEnableFlash() {
-	return enableFlash;
-    }
-
-    public void setEnableFlash(Boolean enableFlash) {
-	this.enableFlash = enableFlash;
-    }
-
     public String getLamsCommunityToken() {
 	return lamsCommunityToken;
     }
@@ -646,21 +636,19 @@
     }
 
     public Date getModifiedDate() {
-        return modifiedDate;
+	return modifiedDate;
     }
 
     public void setModifiedDate(Date modifiedDate) {
-        this.modifiedDate = modifiedDate;
+	this.modifiedDate = modifiedDate;
     }
 
     public String getOpenidURL() {
-		return openidURL;
-	}
+	return openidURL;
+    }
 
-	public void setOpenidURL(String openidURL) {
-		this.openidURL = openidURL;
-	}
-    
-    
+    public void setOpenidURL(String openidURL) {
+	this.openidURL = openidURL;
+    }
 
 }
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java
===================================================================
diff -u -r7998a31f6d7d4f1eef3e866bafef22caa012eb7a -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java	(.../UserDTO.java)	(revision 7998a31f6d7d4f1eef3e866bafef22caa012eb7a)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java	(.../UserDTO.java)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -47,7 +47,6 @@
     private CSSThemeBriefDTO htmlTheme;
     private TimeZone timeZone;
     private Integer authenticationMethodId;
-    private Boolean enableFlash;
     private String lamsCommunityToken;
     private String lamsCommunityUsername;
     private Boolean loggedIntoLamsCommunity;
@@ -58,7 +57,7 @@
     public UserDTO(Integer userID, String firstName, String lastName, String login, String localeLanguage,
 	    String localeCountry, String direction, String email, CSSThemeBriefDTO flashTheme,
 	    CSSThemeBriefDTO htmlTheme, TimeZone timezone, Integer authenticationMethodId, String fckLanguageMapping,
-	    Boolean enableFlash, String lamsCommunityToken, String lamsCommunityUsername, Boolean tutorialsDisabled,
+	    String lamsCommunityToken, String lamsCommunityUsername, Boolean tutorialsDisabled,
 	    Set<String> pagesWithDisabledTutorials, Boolean firstLogin) {
 	this.userID = userID;
 	this.firstName = firstName;
@@ -73,7 +72,6 @@
 	timeZone = timezone;
 	this.authenticationMethodId = authenticationMethodId;
 	this.fckLanguageMapping = fckLanguageMapping;
-	this.enableFlash = enableFlash;
 	this.lamsCommunityToken = lamsCommunityToken;
 	this.lamsCommunityUsername = lamsCommunityUsername;
 	this.tutorialsDisabled = tutorialsDisabled;
@@ -86,7 +84,7 @@
      */
     @Override
     public boolean equals(Object o) {
-	if (o != null && o.getClass() == this.getClass()) {
+	if ((o != null) && (o.getClass() == this.getClass())) {
 	    return ((UserDTO) o).userID == userID;
 	} else {
 	    return false;
@@ -175,30 +173,23 @@
 
     @Override
     public String toString() {
-	return new ToStringBuilder(this).append("userID", getUserID()).append("firstName", getFirstName()).append(
-		"lastName", getLastName()).append("login", getLogin()).append("localeLanguage", getLocaleLanguage())
-		.append("localeCountry", getLocaleCountry()).append("direction", getDirection()).append("email",
-			getEmail()).append("flashTheme", getFlashTheme()).append("htmlTheme", getHtmlTheme()).append(
-			"timeZone", getTimeZone()).append("authenticationMethodId", getAuthenticationMethodId())
-		.append("fckLanguageMapping", getFckLanguageMapping()).append("enableFlash", getEnableFlash()).append(
-			"lamsCommunityUser", this.getLamsCommunityUsername()).append("lamsCommunityToken",
-			this.getLamsCommunityToken()).append("loggedIntoLamsCommunity",
-			"" + this.getLoggedIntoLamsCommunity())
+	return new ToStringBuilder(this).append("userID", getUserID()).append("firstName", getFirstName())
+		.append("lastName", getLastName()).append("login", getLogin())
+		.append("localeLanguage", getLocaleLanguage()).append("localeCountry", getLocaleCountry())
+		.append("direction", getDirection()).append("email", getEmail()).append("flashTheme", getFlashTheme())
+		.append("htmlTheme", getHtmlTheme()).append("timeZone", getTimeZone())
+		.append("authenticationMethodId", getAuthenticationMethodId())
+		.append("fckLanguageMapping", getFckLanguageMapping())
+		.append("lamsCommunityUser", this.getLamsCommunityUsername())
+		.append("lamsCommunityToken", this.getLamsCommunityToken())
+		.append("loggedIntoLamsCommunity", "" + this.getLoggedIntoLamsCommunity())
 		.append("tutorialsDisabled", "" + getTutorialsDisabled()).toString();
     }
 
     public String getFckLanguageMapping() {
 	return fckLanguageMapping;
     }
 
-    public Boolean getEnableFlash() {
-	return enableFlash;
-    }
-
-    public void setEnableFlash(Boolean enableFlash) {
-	this.enableFlash = enableFlash;
-    }
-
     public String getLamsCommunityToken() {
 	return lamsCommunityToken;
     }
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/LdapService.java
===================================================================
diff -u -raa42dbf86055437fc70051efeae12084001e71d6 -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/LdapService.java	(.../LdapService.java)	(revision aa42dbf86055437fc70051efeae12084001e71d6)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/LdapService.java	(.../LdapService.java)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -151,7 +151,6 @@
 		user.setMobilePhone(map.get("mobile"));
 		user.setAuthenticationMethod((AuthenticationMethod) service.findById(AuthenticationMethod.class,
 			AuthenticationMethod.LDAP));
-		user.setEnableFlash(Configuration.getAsBoolean(ConfigurationKeys.FLASH_ENABLE));
 		user.setFlashTheme(service.getDefaultFlashTheme());
 		user.setHtmlTheme(service.getDefaultHtmlTheme());
 		user.setDisabledFlag(getDisabledBoolean(attrs));
Index: lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
===================================================================
diff -u -r430f979ac0574e45242bd6e3df353d8592276121 -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java	(.../ConfigurationKeys.java)	(revision 430f979ac0574e45242bd6e3df353d8592276121)
+++ lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java	(.../ConfigurationKeys.java)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -142,8 +142,6 @@
     public static String ALLOW_EDIT_ON_FLY = "AllowLiveEdit";
     
     public static String SHOW_ALL_MY_LESSON_LINK = "ShowAllMyLessonLink";
-    
-    public static String FORCE_MOBILE_DEV_TO_USE_FLASHLESS = "ForceMobileDevToUseFlashless";
 
     public static String LDAP_PROVISIONING_ENABLED = "LDAPProvisioningEnabled";
 
@@ -234,9 +232,6 @@
 
     public static String CUSTOM_TAB_TITLE = "CustomTabTitle";
 
-    /** Disable Flash altogether for the learner interface (LDEV-1005) */
-    public static String FLASH_ENABLE = "EnableFlash";
-
     /**
      * Configurable screen sizes for authoring, monitor, learner and admin
      * (LDEV-1598)
Index: lams_gradebook/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r889235949834f3e9887318d10d0b21860f6b7b3c -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_gradebook/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 889235949834f3e9887318d10d0b21860f6b7b3c)
+++ lams_gradebook/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -83,7 +83,11 @@
 		}
 	}
     function doSubmit_Form_Only() {
-    	document.getElementById("${formID}").submit();
+    	var form = document.getElementById("${formID}");
+    	//invoke onsubmit event if it's available, submit form afterwards
+    	if (form.onsubmit == null || (form.onsubmit != null) && form.onsubmit()) {
+    		form.submit();
+    	}
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
@@ -102,7 +106,7 @@
 			doAjaxCall(clearSessionUrl);
 		} else {
 			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
-				window.location.href = notifyCloseURL;
+				window.location.href = notifyCloseURL + '&action=' + nextAction;
 			} else if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
 			} else {
Index: lams_gradebook/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -rc4f48ae00b40f09c6be7d1a595054933dca54623 -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_gradebook/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision c4f48ae00b40f09c6be7d1a595054933dca54623)
+++ lams_gradebook/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -53,6 +53,9 @@
 		
 		CKEDITOR.basePath = "${ckEditorBasePath}";
 	    
+	    var editor = CKEDITOR.instances["${id}"];
+	    if (editor) { editor.destroy(true); }
+	    
 		var instance = CKEDITOR.replace( "${id}", {
 				width                         : "${width}",
 				height                        : "${height}",
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_gradebook/web/WEB-INF/tags/Passon.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_gradebook/web/WEB-INF/tags/TextSearch.tag
===================================================================
diff -u -re074865bde063cd3ac9e531a90857d07de9d121c -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_gradebook/web/WEB-INF/tags/TextSearch.tag	(.../TextSearch.tag)	(revision e074865bde063cd3ac9e531a90857d07de9d121c)
+++ lams_gradebook/web/WEB-INF/tags/TextSearch.tag	(.../TextSearch.tag)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -133,4 +133,4 @@
 	</lams:ImgButtonWrapper>
 	</form>
 </c:if>
-<!-- end text search form content -->
+<!-- end text search form content -->
\ No newline at end of file
Index: lams_gradebook/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rd56929f06ad90a63082d514e6521adc175f3de27 -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_gradebook/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision d56929f06ad90a63082d514e6521adc175f3de27)
+++ lams_gradebook/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -11,6 +11,10 @@
    <display-name>LAMSTags</display-name>
    <description><![CDATA[LAMS custom tags]]></description>
 
+   <listener>
+      <listener-class>org.lamsfoundation.lams.web.SessionListener</listener-class>
+   </listener>
+
    <tag>
 
       <description>Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/</description>
@@ -24,23 +28,47 @@
    </tag>
    <tag>
 
-      <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-      <display-name>generate unique ID</display-name>
+      <description>Help tag</description>
+      <display-name>Help tag</display-name>
       <icon>    
       </icon>
-      <name>generateID</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.GenerateIDTag</tag-class>
+      <name>help</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.HelpTag</tag-class>
       <body-content>empty</body-content>
 
       <attribute>
-         <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-         <name>id</name>
+         <description>Help tag</description>
+         <name>module</name>
          <required>false</required>
 
            <rtexprvalue>true</rtexprvalue>
 
       </attribute>
+      <attribute>
+         <description>Help tag</description>
+         <name>toolSignature</name>
+         <required>false</required>
 
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+      <attribute>
+         <description>Help tag</description>
+         <name>page</name>
+         <required>false</required>
+
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+      <attribute>
+         <description>Help tag</description>
+         <name>style</name>
+         <required>false</required>
+
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
    </tag>
    <tag>
 
@@ -143,61 +171,6 @@
    </tag>
    <tag>
 
-      <description>Help tag</description>
-      <display-name>Help tag</display-name>
-      <icon>    
-      </icon>
-      <name>help</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.HelpTag</tag-class>
-      <body-content>empty</body-content>
-
-      <attribute>
-         <description>Help tag</description>
-         <name>module</name>
-         <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-      <attribute>
-         <description>Help tag</description>
-         <name>toolSignature</name>
-         <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-      <attribute>
-         <description>Help tag</description>
-         <name>page</name>
-         <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-      <attribute>
-         <description>Help tag</description>
-         <name>style</name>
-         <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-
-   </tag>
-   <tag>
-
-      <description>Checks whether Flash enabled for learner</description>
-      <display-name>Checks whether Flash enabled for learner</display-name>
-      <icon>    
-      </icon>
-      <name>LearnerFlashEnabled</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-      <body-content>empty</body-content>
-
-   </tag>
-   <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -300,6 +273,11 @@
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
+			<name>index</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
 			<name>indexed</name>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
@@ -452,12 +430,8 @@
    	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
-   	</tag-file>   	
+   	</tag-file>
    	<tag-file>
-       <name>Passon</name>
-       <path>/WEB-INF/tags/Passon.tag</path>
-   	</tag-file>  
-   	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
    	</tag-file>  
@@ -503,15 +477,6 @@
         <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
-  	<tag>
-	  	<description>Checks whether Flash enabled for learner</description>
-	  	<display-name>Checks whether Flash enabled for learner</display-name>
-	 	<icon>    
-	 	</icon>
-	 	<name>LearnerFlashEnabled</name>
-	 	<tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-	 	<body-content>empty</body-content>
- 	</tag> 
 	<tag-file>
 		<name>head</name>
 	    <path>/WEB-INF/tags/Head.tag</path>
Index: lams_learning/conf/xdoclet/servlet-mappings.xml
===================================================================
diff -u -re51e0ce46e7aeb7d3b94bd0496667b07246d3dcd -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_learning/conf/xdoclet/servlet-mappings.xml	(.../servlet-mappings.xml)	(revision e51e0ce46e7aeb7d3b94bd0496667b07246d3dcd)
+++ lams_learning/conf/xdoclet/servlet-mappings.xml	(.../servlet-mappings.xml)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -1,3 +1,5 @@
+<!-- Optional Module Placeholder - do not remove -->
+
 <servlet-mapping>
 	<servlet-name>action</servlet-name>
     <url-pattern>*.do</url-pattern>
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_learning/web/WEB-INF/tags/Passon.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_learning/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_learning/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_learning/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -28,26 +28,6 @@
    </tag>
    <tag>
 
-      <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-      <display-name>generate unique ID</display-name>
-      <icon>    
-      </icon>
-      <name>generateID</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.GenerateIDTag</tag-class>
-      <body-content>empty</body-content>
-
-      <attribute>
-         <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-         <name>id</name>
-         <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-
-   </tag>
-   <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
@@ -191,17 +171,6 @@
    </tag>
    <tag>
 
-      <description>Checks whether Flash enabled for learner</description>
-      <display-name>Checks whether Flash enabled for learner</display-name>
-      <icon>    
-      </icon>
-      <name>LearnerFlashEnabled</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-      <body-content>empty</body-content>
-
-   </tag>
-   <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -304,6 +273,11 @@
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
+			<name>index</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
 			<name>indexed</name>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
@@ -456,12 +430,8 @@
    	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
-   	</tag-file>   	
+   	</tag-file>
    	<tag-file>
-       <name>Passon</name>
-       <path>/WEB-INF/tags/Passon.tag</path>
-   	</tag-file>  
-   	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
    	</tag-file>  
@@ -507,15 +477,6 @@
         <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
-  	<tag>
-	  	<description>Checks whether Flash enabled for learner</description>
-	  	<display-name>Checks whether Flash enabled for learner</display-name>
-	 	<icon>    
-	 	</icon>
-	 	<name>LearnerFlashEnabled</name>
-	 	<tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-	 	<body-content>empty</body-content>
- 	</tag> 
 	<tag-file>
 		<name>head</name>
 	    <path>/WEB-INF/tags/Head.tag</path>
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_learning/web/common/progressOutput.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_learning/web/css/mainflash.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_learning/web/lams_learner.swf
===================================================================
diff -u -re47890c32f932fde18be28fe3f8cedbd781a5219 -r606581007abbdaee5483777096f32ffac1c3e3eb
Binary files differ
Index: lams_learning/web/lessonComplete.jsp
===================================================================
diff -u -r6950295e2d5e90ffae268faeae946718654ddc7b -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_learning/web/lessonComplete.jsp	(.../lessonComplete.jsp)	(revision 6950295e2d5e90ffae268faeae946718654ddc7b)
+++ lams_learning/web/lessonComplete.jsp	(.../lessonComplete.jsp)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -27,13 +27,8 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<c:set var="enableFlash"><lams:LearnerFlashEnabled/></c:set>
 <c:set var="displayPrintButton"><lams:Configuration key="DisplayPrintButton"/></c:set>
 
-<c:if test="${enableFlash}">
-	<lams:Passon id="${activityForm.lessonID}" progress="${activityForm.progressSummary}" />
-</c:if>
-
 <div id="content">
 
 	<h2>
Index: lams_learning/web/loadToolActivity.jsp
===================================================================
diff -u -re6d77f0535a4b300b55cf77f98d0ba7a215fa476 -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_learning/web/loadToolActivity.jsp	(.../loadToolActivity.jsp)	(revision e6d77f0535a4b300b55cf77f98d0ba7a215fa476)
+++ lams_learning/web/loadToolActivity.jsp	(.../loadToolActivity.jsp)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -38,12 +38,6 @@
 String pathToRoot = protocol+request.getServerName()+":"+request.getServerPort()+request.getContextPath()+"/";
 
 %>
-<c:set var="enableFlash"><lams:LearnerFlashEnabled/></c:set>
-
-<c:if test="${enableFlash}">
-	<lams:Passon id="${activityForm.lessonID}" progress="${activityForm.progressSummary}" version="${activityForm.version}" redirect="true"/>
-</c:if>
-
 <div id="content">
 
 	<c:if test="${!empty activityForm.activityURLs}">
@@ -67,17 +61,11 @@
 			//-->
 		</script>
 
-		<c:if test="${not enableFlash}">
-		<script language="JavaScript" type="text/JavaScript"><!--
+		<script language="JavaScript" type="text/JavaScript">
 			window.onload = redirectPage;
-			//-->
 		</script>
-		</c:if>
 		
 		<p><fmt:message key="message.activity.loading"/></p>
-
-	<!-- <p>Tool summary is <c:out value="${activityForm.progressSummary}" escapeXml="false" /></p> -->
-
 	</c:if>
 
 </div>  <!--closes content-->
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_learning/web/mainflash.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_learning/web/mainnoflash.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_learning/web/mobile/lessonComplete.jsp
===================================================================
diff -u -rb600b6d036e00137bf23359f5ad27a24702f3550 -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_learning/web/mobile/lessonComplete.jsp	(.../lessonComplete.jsp)	(revision b600b6d036e00137bf23359f5ad27a24702f3550)
+++ lams_learning/web/mobile/lessonComplete.jsp	(.../lessonComplete.jsp)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -26,19 +26,13 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<c:set var="enableFlash"><lams:LearnerFlashEnabled/></c:set>
 <c:set var="displayPrintButton"><lams:Configuration key="DisplayPrintButton"/></c:set>
 
 <div data-role="header" data-theme="b" data-nobackbtn="true">
 	<h1>&nbsp;</h1>
 </div>
 
 <div data-role="content">
-
-	<c:if test="${enableFlash}">
-		<lams:Passon id="${activityForm.lessonID}" progress="${activityForm.progressSummary}" />
-	</c:if>
-
 	<h2>
 		<fmt:message key="message.lesson.finished">
 			<fmt:param>
Index: lams_learning/web/optionsActivity.jsp
===================================================================
diff -u -rb4ef569ce50eb7b94fa9e1fd9e874829edade0d4 -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_learning/web/optionsActivity.jsp	(.../optionsActivity.jsp)	(revision b4ef569ce50eb7b94fa9e1fd9e874829edade0d4)
+++ lams_learning/web/optionsActivity.jsp	(.../optionsActivity.jsp)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -1,13 +1,5 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<c:set var="enableFlash">
-	<lams:LearnerFlashEnabled />
-</c:set>
-<c:if test="${enableFlash}">
-	<lams:Passon id="${optionsActivityForm.lessonID}"
-		progress="${optionsActivityForm.progressSummary}" />
-</c:if>
-
 <%
 	if (request.getAttribute("activity") instanceof org.lamsfoundation.lams.learningdesign.OptionsWithSequencesActivity) {
 		request.setAttribute("isOptionsWithSequencesActivity", "true");
Index: lams_learning/web/passon.swf
===================================================================
diff -u -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6 -r606581007abbdaee5483777096f32ffac1c3e3eb
Binary files differ
Index: lams_learning/web/previewDefineLater.jsp
===================================================================
diff -u -rb2616ff3a4153db1ee5f5f3919772b3bb6224893 -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_learning/web/previewDefineLater.jsp	(.../previewDefineLater.jsp)	(revision b2616ff3a4153db1ee5f5f3919772b3bb6224893)
+++ lams_learning/web/previewDefineLater.jsp	(.../previewDefineLater.jsp)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -26,14 +26,6 @@
 	<%@ taglib uri="tags-fmt" prefix="fmt" %>
 	<%@ taglib uri="tags-lams" prefix="lams" %>
 
-
-<c:set var="enableFlash"><lams:LearnerFlashEnabled/></c:set>
-
-<c:if test="${enableFlash}">
-	<lams:Passon id="${activityForm.lessonID}" progress="${activityForm.progressSummary}" version="${activityForm.version}" redirect="false"/>
-</c:if>
-
-
 	<div id="content">
 
 		<h1><fmt:message key="label.preview.definelater.title"/></h1>
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_learning/web/progress.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_learning/web/progressBroken.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
===================================================================
diff -u -r3b70087062500e57ffd0a57c798716883ca61150 -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java	(.../IMonitoringService.java)	(revision 3b70087062500e57ffd0a57c798716883ca61150)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java	(.../IMonitoringService.java)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -36,7 +36,6 @@
 import org.lamsfoundation.lams.learningdesign.GroupingActivity;
 import org.lamsfoundation.lams.learningdesign.ScheduleGateActivity;
 import org.lamsfoundation.lams.learningdesign.ToolActivity;
-import org.lamsfoundation.lams.learningdesign.exception.LearningDesignProcessorException;
 import org.lamsfoundation.lams.lesson.LearnerProgress;
 import org.lamsfoundation.lams.lesson.Lesson;
 import org.lamsfoundation.lams.lesson.service.LessonServiceException;
@@ -449,19 +448,21 @@
      * @throws IOException
      */
     public String getLearningDesignDetails(Long lessonID) throws IOException;
-
+    
     /**
-     * This method is called when the user clicks the 'Contribute' tab in the monitoring enviornment. It returns a list
-     * of activities "in the order" they have to be performed and with additional information as to what kind of
-     * contribution (Define later content, Moderation, Contribution, Permission for gate activity, Chosen Grouing etc.)
-     * is reuired from the user(teacher/staff).
+     * This method returns the progress information of all learners in a given Lesson.
      * 
      * @param lessonID
-     *            The lesson_id of the Lesson for which the information has to be fetched.
-     * @return String The required information in WDDX format
+     *            The lesson_id of the Lesson whose progress information is required
+     * @param learnerID
+     *            The learner_id of the class learner whose progress information is required If null, provide all
+     *            learner's progress information.
+     * @param userID
+     *            The user id of the user requesting the progress details
+     * @return String The requested information in wddx format
      * @throws IOException
      */
-    public String getAllContributeActivities(Long lessonID) throws IOException, LearningDesignProcessorException;
+    public String getAllCompletedActivities(Long lessonID, Long learnerID, Integer userID) throws IOException;
 
     public List<ContributeActivityDTO> getAllContributeActivityDTO(Long lessonID);
 
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
===================================================================
diff -u -r3b70087062500e57ffd0a57c798716883ca61150 -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(.../MonitoringService.java)	(revision 3b70087062500e57ffd0a57c798716883ca61150)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(.../MonitoringService.java)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -2005,6 +2005,61 @@
     }
 
     /**
+     * (non-Javadoc)
+     * 
+     * @see org.lamsfoundation.lams.monitoring.service.IMonitoringService#getAllLearnersProgress(java.lang.Long,
+     *      java.lang.Integer)
+     */
+    public String getAllLearnersProgress(Long lessonID, Integer userID, Boolean completedDataOnly) throws IOException {
+	Lesson lesson = lessonDAO.getLesson(lessonID);
+	FlashMessage flashMessage;
+
+	if (lesson != null) {
+	    checkOwnerOrStaffMember(userID, lesson, "get all learners progress");
+	    Vector progressData = new Vector();
+	    Iterator iterator = lesson.getLearnerProgresses().iterator();
+	    while (iterator.hasNext()) {
+		LearnerProgress learnerProgress = (LearnerProgress) iterator.next();
+		if (!completedDataOnly) {
+		    progressData.add(learnerProgress.getLearnerProgressData());
+		} else {
+		    progressData.add(learnerProgress.getLearnerProgressCompletedData());
+		}
+	    }
+	    flashMessage = (!completedDataOnly) ? new FlashMessage("getAllLearnersProgress", progressData)
+		    : new FlashMessage("getAllCompletedActivities", progressData);
+	} else {
+	    flashMessage = new FlashMessage("getAllLearnersProgress", messageService.getMessage("NO.SUCH.LESSON",
+		    new Object[] { lessonID }), FlashMessage.ERROR);
+	}
+	return flashMessage.serializeMessage();
+    }
+    
+    public String getAllCompletedActivities(Long lessonID, Long learnerID, Integer userID) throws IOException {
+	Lesson lesson = lessonDAO.getLesson(lessonID);
+	FlashMessage flashMessage;
+
+	if (lesson != null) {
+	    checkOwnerOrStaffMember(userID, lesson, "get all learners progress");
+	    Vector progressData = new Vector();
+
+	    if (learnerID != null) {
+		LearnerProgress learnerProgress = learnerService.getProgress(new Integer(learnerID.intValue()),
+			lessonID);
+		progressData.add(learnerProgress.getLearnerProgressCompletedData());
+		flashMessage = new FlashMessage("getAllCompletedActivities", progressData);
+	    } else {
+		return getAllLearnersProgress(lessonID, userID, true);
+	    }
+
+	} else {
+	    flashMessage = new FlashMessage("getAllCompletedActivities", messageService.getMessage("NO.SUCH.LESSON",
+		    new Object[] { lessonID }), FlashMessage.ERROR);
+	}
+	return flashMessage.serializeMessage();
+    }
+    
+    /**
      * @see org.lamsfoundation.lams.monitoring.service.IMonitoringService#getActivityById(Long, Class)
      */
     public Activity getActivityById(Long activityId, Class clasz) {
@@ -2030,27 +2085,6 @@
 	return (GroupingActivity) activity;
     }
 
-    /**
-     * (non-Javadoc)
-     * 
-     * @see org.lamsfoundation.lams.monitoring.service.IMonitoringService#getAllContributeActivities(java.lang.Long)
-     */
-    public String getAllContributeActivities(Long lessonID) throws IOException, LearningDesignProcessorException {
-	Lesson lesson = lessonDAO.getLesson(lessonID);
-	FlashMessage flashMessage;
-	if (lesson != null) {
-	    ContributeActivitiesProcessor processor = new ContributeActivitiesProcessor(lesson.getLearningDesign(),
-		    lessonID, activityDAO, lamsCoreToolService);
-	    processor.parseLearningDesign();
-	    Vector activities = processor.getMainActivityList();
-	    flashMessage = new FlashMessage("getAllContributeActivities", activities);
-	} else {
-	    flashMessage = new FlashMessage("getAllContributeActivities", messageService.getMessage("NO.SUCH.LESSON",
-		    new Object[] { lessonID }), FlashMessage.ERROR);
-	}
-	return flashMessage.serializeMessage();
-    }
-
     public List<ContributeActivityDTO> getAllContributeActivityDTO(Long lessonID) {
 	List<ContributeActivityDTO> result = null;
 	Lesson lesson = lessonDAO.getLesson(lessonID);
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
===================================================================
diff -u -r3b70087062500e57ffd0a57c798716883ca61150 -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	(.../MonitoringAction.java)	(revision 3b70087062500e57ffd0a57c798716883ca61150)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	(.../MonitoringAction.java)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -728,32 +728,6 @@
 		    + messageService.getMessage(languageCollection.get(i)) + "</name></entry>";
 	}
 
-	Integer orgId = WebUtil.readIntParam(request, "orgId", true);
-	if (module.equals("wizard") && (orgId != null)) {
-
-	    Organisation organisation = monitoringService.getOrganisation(orgId);
-
-	    int count = 0;
-	    Set<Lesson> organisationLessons = new TreeSet<Lesson>(new LessonComparator());
-	    organisationLessons.addAll(organisation.getLessons());
-	    for (Lesson lesson : organisationLessons) {
-		if (!Lesson.REMOVED_STATE.equals(lesson.getLessonStateId())
-			&& !Lesson.FINISHED_STATE.equals(lesson.getLessonStateId())) {
-		    languageOutput += "<entry key='lessonID" + count++ + "'>" + "<name>" + lesson.getLessonName()
-			    + "</name>" + "<data>" + lesson.getLessonId() + "</data>" + "</entry>";
-		}
-	    }
-
-	    // // sort lessons
-	    // TreeSet<Timezone> lessons = new TreeSet<Timezone>(new TimezoneComparator());
-	    // lessons.addAll(getTimezoneService().getDefaultTimezones());
-
-	    // let Flex know the number of lessons
-	    languageOutput += "<entry key='lessonsNumber'><data>" + count + "</data></entry>";
-
-	    languageOutput += "<entry key='orgName'><name>" + organisation.getName() + "</name></entry>";
-	}
-
 	languageOutput += "</language></xml>";
 
 	response.setContentType("text/xml");
@@ -762,25 +736,28 @@
 
 	return null;
     }
-
-    public ActionForward getAllContributeActivities(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+    
+    public ActionForward getAllCompletedActivities(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws IOException {
 
+	String wddxPacket;
 	IMonitoringService monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet()
 		.getServletContext());
-	String wddxPacket = null;
 	try {
-	    Long lessonID = new Long(WebUtil.readLongParam(request, "lessonID"));
-	    wddxPacket = monitoringService.getAllContributeActivities(lessonID);
+	    Long lessonID = WebUtil.readLongParam(request, "lessonID", false);
+	    Long learnerID = WebUtil.readLongParam(request, "learnerID", true);
+	    wddxPacket = monitoringService.getAllCompletedActivities(lessonID, learnerID, getUserId());
+
 	} catch (Exception e) {
-	    FlashMessage flashMessage = handleException(e, "getAllContributeActivities", monitoringService);
-	    wddxPacket = flashMessage.serializeMessage();
+	    wddxPacket = handleException(e, "getAllLearnersProgress", monitoringService).serializeMessage();
 	}
+
 	PrintWriter writer = response.getWriter();
 	writer.println(wddxPacket);
 	return null;
-    }
 
+    }
+    
     /**
      * Calls the server to bring up the learner progress page. Assumes destination is a new window. The userid that
      * comes from Flash is the user id of the learner for which we are calculating the url. This is different to all the
@@ -1255,24 +1232,12 @@
      */
     public ActionForward learnerExportPortfolioAvailable(ActionMapping mapping, ActionForm form,
 	    HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
-
 	IMonitoringService monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet()
 		.getServletContext());
-	FlashMessage flashMessage = null;
-	try {
-	    Long lessonID = new Long(WebUtil.readLongParam(request, "lessonID"));
-	    Integer userID = getUserId();
-	    Boolean learnerExportPortfolioAvailable = WebUtil
-		    .readBooleanParam(request, "learnerExportPortfolio", false);
-	    monitoringService.setLearnerPortfolioAvailable(lessonID, userID, learnerExportPortfolioAvailable);
-
-	    flashMessage = new FlashMessage("learnerExportPortfolioAvailable", "learnerExportPortfolioAvailable");
-	} catch (Exception e) {
-	    flashMessage = handleException(e, "renameLesson", monitoringService);
-	}
-	String wddxPacket = flashMessage.serializeMessage();
-	PrintWriter writer = response.getWriter();
-	writer.println(wddxPacket);
+	Long lessonID = new Long(WebUtil.readLongParam(request, "lessonID"));
+	Integer userID = getUserId();
+	Boolean learnerExportPortfolioAvailable = WebUtil.readBooleanParam(request, "learnerExportPortfolio", false);
+	monitoringService.setLearnerPortfolioAvailable(lessonID, userID, learnerExportPortfolioAvailable);
 	return null;
     }
 
@@ -1282,28 +1247,19 @@
      */
     public ActionForward presenceAvailable(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws IOException, ServletException {
-
 	IMonitoringService monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet()
 		.getServletContext());
-	FlashMessage flashMessage = null;
-	try {
-	    Long lessonID = new Long(WebUtil.readLongParam(request, "lessonID"));
-	    Integer userID = getUserId();
-	    Boolean presenceAvailable = WebUtil.readBooleanParam(request, "presenceAvailable", false);
 
-	    monitoringService.setPresenceAvailable(lessonID, userID, presenceAvailable);
+	Long lessonID = new Long(WebUtil.readLongParam(request, "lessonID"));
+	Integer userID = getUserId();
+	Boolean presenceAvailable = WebUtil.readBooleanParam(request, "presenceAvailable", false);
 
-	    if (!presenceAvailable) {
-		monitoringService.setPresenceImAvailable(lessonID, userID, false);
-	    }
+	monitoringService.setPresenceAvailable(lessonID, userID, presenceAvailable);
 
-	    flashMessage = new FlashMessage("presenceAvailable", "presenceAvailable");
-	} catch (Exception e) {
-	    flashMessage = handleException(e, "presenceAvailable", monitoringService);
+	if (!presenceAvailable) {
+	    monitoringService.setPresenceImAvailable(lessonID, userID, false);
 	}
-	String wddxPacket = flashMessage.serializeMessage();
-	PrintWriter writer = response.getWriter();
-	writer.println(wddxPacket);
+
 	return null;
     }
 
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_monitoring/web/WEB-INF/tags/Passon.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_monitoring/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_monitoring/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_monitoring/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -28,26 +28,6 @@
    </tag>
    <tag>
 
-      <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-      <display-name>generate unique ID</display-name>
-      <icon>    
-      </icon>
-      <name>generateID</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.GenerateIDTag</tag-class>
-      <body-content>empty</body-content>
-
-      <attribute>
-         <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-         <name>id</name>
-         <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-
-   </tag>
-   <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
@@ -191,17 +171,6 @@
    </tag>
    <tag>
 
-      <description>Checks whether Flash enabled for learner</description>
-      <display-name>Checks whether Flash enabled for learner</display-name>
-      <icon>    
-      </icon>
-      <name>LearnerFlashEnabled</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-      <body-content>empty</body-content>
-
-   </tag>
-   <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -304,6 +273,11 @@
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
+			<name>index</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
 			<name>indexed</name>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
@@ -456,12 +430,8 @@
    	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
-   	</tag-file>   	
+   	</tag-file>
    	<tag-file>
-       <name>Passon</name>
-       <path>/WEB-INF/tags/Passon.tag</path>
-   	</tag-file>  
-   	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
    	</tag-file>  
@@ -507,15 +477,6 @@
         <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
-  	<tag>
-	  	<description>Checks whether Flash enabled for learner</description>
-	  	<display-name>Checks whether Flash enabled for learner</display-name>
-	 	<icon>    
-	 	</icon>
-	 	<name>LearnerFlashEnabled</name>
-	 	<tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-	 	<body-content>empty</body-content>
- 	</tag> 
 	<tag-file>
 		<name>head</name>
 	    <path>/WEB-INF/tags/Head.tag</path>
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_tool_assessment/web/WEB-INF/tags/Passon.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -28,26 +28,6 @@
    </tag>
    <tag>
 
-      <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-      <display-name>generate unique ID</display-name>
-      <icon>    
-      </icon>
-      <name>generateID</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.GenerateIDTag</tag-class>
-      <body-content>empty</body-content>
-
-      <attribute>
-         <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-         <name>id</name>
-         <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-
-   </tag>
-   <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
@@ -191,17 +171,6 @@
    </tag>
    <tag>
 
-      <description>Checks whether Flash enabled for learner</description>
-      <display-name>Checks whether Flash enabled for learner</display-name>
-      <icon>    
-      </icon>
-      <name>LearnerFlashEnabled</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-      <body-content>empty</body-content>
-
-   </tag>
-   <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -304,6 +273,11 @@
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
+			<name>index</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
 			<name>indexed</name>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
@@ -456,12 +430,8 @@
    	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
-   	</tag-file>   	
+   	</tag-file>
    	<tag-file>
-       <name>Passon</name>
-       <path>/WEB-INF/tags/Passon.tag</path>
-   	</tag-file>  
-   	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
    	</tag-file>  
@@ -507,15 +477,6 @@
         <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
-  	<tag>
-	  	<description>Checks whether Flash enabled for learner</description>
-	  	<display-name>Checks whether Flash enabled for learner</display-name>
-	 	<icon>    
-	 	</icon>
-	 	<name>LearnerFlashEnabled</name>
-	 	<tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-	 	<body-content>empty</body-content>
- 	</tag> 
 	<tag-file>
 		<name>head</name>
 	    <path>/WEB-INF/tags/Head.tag</path>
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tags/Passon.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_bbb/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_tool_bbb/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_bbb/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -28,26 +28,6 @@
    </tag>
    <tag>
 
-      <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-      <display-name>generate unique ID</display-name>
-      <icon>    
-      </icon>
-      <name>generateID</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.GenerateIDTag</tag-class>
-      <body-content>empty</body-content>
-
-      <attribute>
-         <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-         <name>id</name>
-         <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-
-   </tag>
-   <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
@@ -191,17 +171,6 @@
    </tag>
    <tag>
 
-      <description>Checks whether Flash enabled for learner</description>
-      <display-name>Checks whether Flash enabled for learner</display-name>
-      <icon>    
-      </icon>
-      <name>LearnerFlashEnabled</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-      <body-content>empty</body-content>
-
-   </tag>
-   <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -304,6 +273,11 @@
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
+			<name>index</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
 			<name>indexed</name>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
@@ -456,12 +430,8 @@
    	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
-   	</tag-file>   	
+   	</tag-file>
    	<tag-file>
-       <name>Passon</name>
-       <path>/WEB-INF/tags/Passon.tag</path>
-   	</tag-file>  
-   	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
    	</tag-file>  
@@ -507,15 +477,6 @@
         <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
-  	<tag>
-	  	<description>Checks whether Flash enabled for learner</description>
-	  	<display-name>Checks whether Flash enabled for learner</display-name>
-	 	<icon>    
-	 	</icon>
-	 	<name>LearnerFlashEnabled</name>
-	 	<tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-	 	<body-content>empty</body-content>
- 	</tag> 
 	<tag-file>
 		<name>head</name>
 	    <path>/WEB-INF/tags/Head.tag</path>
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_tool_chat/web/WEB-INF/tags/Passon.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_chat/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_tool_chat/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_chat/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -28,26 +28,6 @@
    </tag>
    <tag>
 
-      <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-      <display-name>generate unique ID</display-name>
-      <icon>    
-      </icon>
-      <name>generateID</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.GenerateIDTag</tag-class>
-      <body-content>empty</body-content>
-
-      <attribute>
-         <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-         <name>id</name>
-         <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-
-   </tag>
-   <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
@@ -191,17 +171,6 @@
    </tag>
    <tag>
 
-      <description>Checks whether Flash enabled for learner</description>
-      <display-name>Checks whether Flash enabled for learner</display-name>
-      <icon>    
-      </icon>
-      <name>LearnerFlashEnabled</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-      <body-content>empty</body-content>
-
-   </tag>
-   <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -304,6 +273,11 @@
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
+			<name>index</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
 			<name>indexed</name>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
@@ -456,12 +430,8 @@
    	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
-   	</tag-file>   	
+   	</tag-file>
    	<tag-file>
-       <name>Passon</name>
-       <path>/WEB-INF/tags/Passon.tag</path>
-   	</tag-file>  
-   	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
    	</tag-file>  
@@ -507,15 +477,6 @@
         <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
-  	<tag>
-	  	<description>Checks whether Flash enabled for learner</description>
-	  	<display-name>Checks whether Flash enabled for learner</display-name>
-	 	<icon>    
-	 	</icon>
-	 	<name>LearnerFlashEnabled</name>
-	 	<tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-	 	<body-content>empty</body-content>
- 	</tag> 
 	<tag-file>
 		<name>head</name>
 	    <path>/WEB-INF/tags/Head.tag</path>
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_tool_daco/web/WEB-INF/tags/Passon.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -28,26 +28,6 @@
    </tag>
    <tag>
 
-      <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-      <display-name>generate unique ID</display-name>
-      <icon>    
-      </icon>
-      <name>generateID</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.GenerateIDTag</tag-class>
-      <body-content>empty</body-content>
-
-      <attribute>
-         <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-         <name>id</name>
-         <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-
-   </tag>
-   <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
@@ -191,17 +171,6 @@
    </tag>
    <tag>
 
-      <description>Checks whether Flash enabled for learner</description>
-      <display-name>Checks whether Flash enabled for learner</display-name>
-      <icon>    
-      </icon>
-      <name>LearnerFlashEnabled</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-      <body-content>empty</body-content>
-
-   </tag>
-   <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -304,6 +273,11 @@
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
+			<name>index</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
 			<name>indexed</name>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
@@ -456,12 +430,8 @@
    	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
-   	</tag-file>   	
+   	</tag-file>
    	<tag-file>
-       <name>Passon</name>
-       <path>/WEB-INF/tags/Passon.tag</path>
-   	</tag-file>  
-   	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
    	</tag-file>  
@@ -507,15 +477,6 @@
         <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
-  	<tag>
-	  	<description>Checks whether Flash enabled for learner</description>
-	  	<display-name>Checks whether Flash enabled for learner</display-name>
-	 	<icon>    
-	 	</icon>
-	 	<name>LearnerFlashEnabled</name>
-	 	<tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-	 	<body-content>empty</body-content>
- 	</tag> 
 	<tag-file>
 		<name>head</name>
 	    <path>/WEB-INF/tags/Head.tag</path>
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_tool_dimdim/web/WEB-INF/tags/Passon.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_tool_eadventure/web/WEB-INF/tags/Passon.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_eadventure/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_tool_eadventure/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_eadventure/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -28,26 +28,6 @@
    </tag>
    <tag>
 
-      <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-      <display-name>generate unique ID</display-name>
-      <icon>    
-      </icon>
-      <name>generateID</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.GenerateIDTag</tag-class>
-      <body-content>empty</body-content>
-
-      <attribute>
-         <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-         <name>id</name>
-         <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-
-   </tag>
-   <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
@@ -191,17 +171,6 @@
    </tag>
    <tag>
 
-      <description>Checks whether Flash enabled for learner</description>
-      <display-name>Checks whether Flash enabled for learner</display-name>
-      <icon>    
-      </icon>
-      <name>LearnerFlashEnabled</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-      <body-content>empty</body-content>
-
-   </tag>
-   <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -304,6 +273,11 @@
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
+			<name>index</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
 			<name>indexed</name>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
@@ -456,12 +430,8 @@
    	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
-   	</tag-file>   	
+   	</tag-file>
    	<tag-file>
-       <name>Passon</name>
-       <path>/WEB-INF/tags/Passon.tag</path>
-   	</tag-file>  
-   	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
    	</tag-file>  
@@ -507,15 +477,6 @@
         <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
-  	<tag>
-	  	<description>Checks whether Flash enabled for learner</description>
-	  	<display-name>Checks whether Flash enabled for learner</display-name>
-	 	<icon>    
-	 	</icon>
-	 	<name>LearnerFlashEnabled</name>
-	 	<tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-	 	<body-content>empty</body-content>
- 	</tag> 
 	<tag-file>
 		<name>head</name>
 	    <path>/WEB-INF/tags/Head.tag</path>
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_tool_forum/web/WEB-INF/tags/Passon.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_forum/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_tool_forum/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_forum/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -28,26 +28,6 @@
    </tag>
    <tag>
 
-      <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-      <display-name>generate unique ID</display-name>
-      <icon>    
-      </icon>
-      <name>generateID</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.GenerateIDTag</tag-class>
-      <body-content>empty</body-content>
-
-      <attribute>
-         <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-         <name>id</name>
-         <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-
-   </tag>
-   <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
@@ -191,17 +171,6 @@
    </tag>
    <tag>
 
-      <description>Checks whether Flash enabled for learner</description>
-      <display-name>Checks whether Flash enabled for learner</display-name>
-      <icon>    
-      </icon>
-      <name>LearnerFlashEnabled</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-      <body-content>empty</body-content>
-
-   </tag>
-   <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -304,6 +273,11 @@
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
+			<name>index</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
 			<name>indexed</name>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
@@ -456,12 +430,8 @@
    	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
-   	</tag-file>   	
+   	</tag-file>
    	<tag-file>
-       <name>Passon</name>
-       <path>/WEB-INF/tags/Passon.tag</path>
-   	</tag-file>  
-   	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
    	</tag-file>  
@@ -507,15 +477,6 @@
         <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
-  	<tag>
-	  	<description>Checks whether Flash enabled for learner</description>
-	  	<display-name>Checks whether Flash enabled for learner</display-name>
-	 	<icon>    
-	 	</icon>
-	 	<name>LearnerFlashEnabled</name>
-	 	<tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-	 	<body-content>empty</body-content>
- 	</tag> 
 	<tag-file>
 		<name>head</name>
 	    <path>/WEB-INF/tags/Head.tag</path>
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/tags/Passon.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_gmap/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_tool_gmap/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_gmap/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -28,26 +28,6 @@
    </tag>
    <tag>
 
-      <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-      <display-name>generate unique ID</display-name>
-      <icon>    
-      </icon>
-      <name>generateID</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.GenerateIDTag</tag-class>
-      <body-content>empty</body-content>
-
-      <attribute>
-         <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-         <name>id</name>
-         <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-
-   </tag>
-   <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
@@ -191,17 +171,6 @@
    </tag>
    <tag>
 
-      <description>Checks whether Flash enabled for learner</description>
-      <display-name>Checks whether Flash enabled for learner</display-name>
-      <icon>    
-      </icon>
-      <name>LearnerFlashEnabled</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-      <body-content>empty</body-content>
-
-   </tag>
-   <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -304,6 +273,11 @@
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
+			<name>index</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
 			<name>indexed</name>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
@@ -456,12 +430,8 @@
    	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
-   	</tag-file>   	
+   	</tag-file>
    	<tag-file>
-       <name>Passon</name>
-       <path>/WEB-INF/tags/Passon.tag</path>
-   	</tag-file>  
-   	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
    	</tag-file>  
@@ -507,15 +477,6 @@
         <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
-  	<tag>
-	  	<description>Checks whether Flash enabled for learner</description>
-	  	<display-name>Checks whether Flash enabled for learner</display-name>
-	 	<icon>    
-	 	</icon>
-	 	<name>LearnerFlashEnabled</name>
-	 	<tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-	 	<body-content>empty</body-content>
- 	</tag> 
 	<tag-file>
 		<name>head</name>
 	    <path>/WEB-INF/tags/Head.tag</path>
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_tool_images/web/WEB-INF/tags/Passon.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_images/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_tool_images/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_images/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -28,26 +28,6 @@
    </tag>
    <tag>
 
-      <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-      <display-name>generate unique ID</display-name>
-      <icon>    
-      </icon>
-      <name>generateID</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.GenerateIDTag</tag-class>
-      <body-content>empty</body-content>
-
-      <attribute>
-         <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-         <name>id</name>
-         <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-
-   </tag>
-   <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
@@ -191,17 +171,6 @@
    </tag>
    <tag>
 
-      <description>Checks whether Flash enabled for learner</description>
-      <display-name>Checks whether Flash enabled for learner</display-name>
-      <icon>    
-      </icon>
-      <name>LearnerFlashEnabled</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-      <body-content>empty</body-content>
-
-   </tag>
-   <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -304,6 +273,11 @@
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
+			<name>index</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
 			<name>indexed</name>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
@@ -456,12 +430,8 @@
    	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
-   	</tag-file>   	
+   	</tag-file>
    	<tag-file>
-       <name>Passon</name>
-       <path>/WEB-INF/tags/Passon.tag</path>
-   	</tag-file>  
-   	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
    	</tag-file>  
@@ -507,15 +477,6 @@
         <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
-  	<tag>
-	  	<description>Checks whether Flash enabled for learner</description>
-	  	<display-name>Checks whether Flash enabled for learner</display-name>
-	 	<icon>    
-	 	</icon>
-	 	<name>LearnerFlashEnabled</name>
-	 	<tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-	 	<body-content>empty</body-content>
- 	</tag> 
 	<tag-file>
 		<name>head</name>
 	    <path>/WEB-INF/tags/Head.tag</path>
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_tool_imscc/web/WEB-INF/tags/Passon.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -28,26 +28,6 @@
    </tag>
    <tag>
 
-      <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-      <display-name>generate unique ID</display-name>
-      <icon>    
-      </icon>
-      <name>generateID</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.GenerateIDTag</tag-class>
-      <body-content>empty</body-content>
-
-      <attribute>
-         <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-         <name>id</name>
-         <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-
-   </tag>
-   <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
@@ -191,17 +171,6 @@
    </tag>
    <tag>
 
-      <description>Checks whether Flash enabled for learner</description>
-      <display-name>Checks whether Flash enabled for learner</display-name>
-      <icon>    
-      </icon>
-      <name>LearnerFlashEnabled</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-      <body-content>empty</body-content>
-
-   </tag>
-   <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -304,6 +273,11 @@
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
+			<name>index</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
 			<name>indexed</name>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
@@ -456,12 +430,8 @@
    	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
-   	</tag-file>   	
+   	</tag-file>
    	<tag-file>
-       <name>Passon</name>
-       <path>/WEB-INF/tags/Passon.tag</path>
-   	</tag-file>  
-   	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
    	</tag-file>  
@@ -507,15 +477,6 @@
         <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
-  	<tag>
-	  	<description>Checks whether Flash enabled for learner</description>
-	  	<display-name>Checks whether Flash enabled for learner</display-name>
-	 	<icon>    
-	 	</icon>
-	 	<name>LearnerFlashEnabled</name>
-	 	<tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-	 	<body-content>empty</body-content>
- 	</tag> 
 	<tag-file>
 		<name>head</name>
 	    <path>/WEB-INF/tags/Head.tag</path>
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_tool_kaltura/web/WEB-INF/tags/Passon.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_tool_lamc/web/WEB-INF/tags/Passon.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rd56929f06ad90a63082d514e6521adc175f3de27 -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision d56929f06ad90a63082d514e6521adc175f3de27)
+++ lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -28,26 +28,6 @@
    </tag>
    <tag>
 
-      <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-      <display-name>generate unique ID</display-name>
-      <icon>    
-      </icon>
-      <name>generateID</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.GenerateIDTag</tag-class>
-      <body-content>empty</body-content>
-
-      <attribute>
-         <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-         <name>id</name>
-         <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-
-   </tag>
-   <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
@@ -191,17 +171,6 @@
    </tag>
    <tag>
 
-      <description>Checks whether Flash enabled for learner</description>
-      <display-name>Checks whether Flash enabled for learner</display-name>
-      <icon>    
-      </icon>
-      <name>LearnerFlashEnabled</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-      <body-content>empty</body-content>
-
-   </tag>
-   <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -304,6 +273,11 @@
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
+			<name>index</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
 			<name>indexed</name>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
@@ -456,12 +430,8 @@
    	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
-   	</tag-file>   	
+   	</tag-file>
    	<tag-file>
-       <name>Passon</name>
-       <path>/WEB-INF/tags/Passon.tag</path>
-   	</tag-file>  
-   	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
    	</tag-file>  
@@ -507,15 +477,6 @@
         <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
-  	<tag>
-	  	<description>Checks whether Flash enabled for learner</description>
-	  	<display-name>Checks whether Flash enabled for learner</display-name>
-	 	<icon>    
-	 	</icon>
-	 	<name>LearnerFlashEnabled</name>
-	 	<tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-	 	<body-content>empty</body-content>
- 	</tag> 
 	<tag-file>
 		<name>head</name>
 	    <path>/WEB-INF/tags/Head.tag</path>
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/tags/Passon.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -28,26 +28,6 @@
    </tag>
    <tag>
 
-      <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-      <display-name>generate unique ID</display-name>
-      <icon>    
-      </icon>
-      <name>generateID</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.GenerateIDTag</tag-class>
-      <body-content>empty</body-content>
-
-      <attribute>
-         <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-         <name>id</name>
-         <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-
-   </tag>
-   <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
@@ -191,17 +171,6 @@
    </tag>
    <tag>
 
-      <description>Checks whether Flash enabled for learner</description>
-      <display-name>Checks whether Flash enabled for learner</display-name>
-      <icon>    
-      </icon>
-      <name>LearnerFlashEnabled</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-      <body-content>empty</body-content>
-
-   </tag>
-   <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -304,6 +273,11 @@
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
+			<name>index</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
 			<name>indexed</name>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
@@ -456,12 +430,8 @@
    	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
-   	</tag-file>   	
+   	</tag-file>
    	<tag-file>
-       <name>Passon</name>
-       <path>/WEB-INF/tags/Passon.tag</path>
-   	</tag-file>  
-   	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
    	</tag-file>  
@@ -507,15 +477,6 @@
         <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
-  	<tag>
-	  	<description>Checks whether Flash enabled for learner</description>
-	  	<display-name>Checks whether Flash enabled for learner</display-name>
-	 	<icon>    
-	 	</icon>
-	 	<name>LearnerFlashEnabled</name>
-	 	<tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-	 	<body-content>empty</body-content>
- 	</tag> 
 	<tag-file>
 		<name>head</name>
 	    <path>/WEB-INF/tags/Head.tag</path>
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_tool_larsrc/web/WEB-INF/tags/Passon.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -28,26 +28,6 @@
    </tag>
    <tag>
 
-      <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-      <display-name>generate unique ID</display-name>
-      <icon>    
-      </icon>
-      <name>generateID</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.GenerateIDTag</tag-class>
-      <body-content>empty</body-content>
-
-      <attribute>
-         <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-         <name>id</name>
-         <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-
-   </tag>
-   <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
@@ -191,17 +171,6 @@
    </tag>
    <tag>
 
-      <description>Checks whether Flash enabled for learner</description>
-      <display-name>Checks whether Flash enabled for learner</display-name>
-      <icon>    
-      </icon>
-      <name>LearnerFlashEnabled</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-      <body-content>empty</body-content>
-
-   </tag>
-   <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -304,6 +273,11 @@
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
+			<name>index</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
 			<name>indexed</name>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
@@ -456,12 +430,8 @@
    	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
-   	</tag-file>   	
+   	</tag-file>
    	<tag-file>
-       <name>Passon</name>
-       <path>/WEB-INF/tags/Passon.tag</path>
-   	</tag-file>  
-   	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
    	</tag-file>  
@@ -507,15 +477,6 @@
         <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
-  	<tag>
-	  	<description>Checks whether Flash enabled for learner</description>
-	  	<display-name>Checks whether Flash enabled for learner</display-name>
-	 	<icon>    
-	 	</icon>
-	 	<name>LearnerFlashEnabled</name>
-	 	<tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-	 	<body-content>empty</body-content>
- 	</tag> 
 	<tag-file>
 		<name>head</name>
 	    <path>/WEB-INF/tags/Head.tag</path>
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_tool_mindmap/web/WEB-INF/tags/Passon.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_mindmap/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_tool_mindmap/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_mindmap/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -28,26 +28,6 @@
    </tag>
    <tag>
 
-      <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-      <display-name>generate unique ID</display-name>
-      <icon>    
-      </icon>
-      <name>generateID</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.GenerateIDTag</tag-class>
-      <body-content>empty</body-content>
-
-      <attribute>
-         <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-         <name>id</name>
-         <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-
-   </tag>
-   <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
@@ -191,17 +171,6 @@
    </tag>
    <tag>
 
-      <description>Checks whether Flash enabled for learner</description>
-      <display-name>Checks whether Flash enabled for learner</display-name>
-      <icon>    
-      </icon>
-      <name>LearnerFlashEnabled</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-      <body-content>empty</body-content>
-
-   </tag>
-   <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -304,6 +273,11 @@
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
+			<name>index</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
 			<name>indexed</name>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
@@ -456,12 +430,8 @@
    	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
-   	</tag-file>   	
+   	</tag-file>
    	<tag-file>
-       <name>Passon</name>
-       <path>/WEB-INF/tags/Passon.tag</path>
-   	</tag-file>  
-   	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
    	</tag-file>  
@@ -507,15 +477,6 @@
         <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
-  	<tag>
-	  	<description>Checks whether Flash enabled for learner</description>
-	  	<display-name>Checks whether Flash enabled for learner</display-name>
-	 	<icon>    
-	 	</icon>
-	 	<name>LearnerFlashEnabled</name>
-	 	<tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-	 	<body-content>empty</body-content>
- 	</tag> 
 	<tag-file>
 		<name>head</name>
 	    <path>/WEB-INF/tags/Head.tag</path>
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_tool_nb/web/WEB-INF/tags/Passon.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_nb/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rd56929f06ad90a63082d514e6521adc175f3de27 -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_tool_nb/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision d56929f06ad90a63082d514e6521adc175f3de27)
+++ lams_tool_nb/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -28,26 +28,6 @@
    </tag>
    <tag>
 
-      <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-      <display-name>generate unique ID</display-name>
-      <icon>    
-      </icon>
-      <name>generateID</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.GenerateIDTag</tag-class>
-      <body-content>empty</body-content>
-
-      <attribute>
-         <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-         <name>id</name>
-         <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-
-   </tag>
-   <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
@@ -191,17 +171,6 @@
    </tag>
    <tag>
 
-      <description>Checks whether Flash enabled for learner</description>
-      <display-name>Checks whether Flash enabled for learner</display-name>
-      <icon>    
-      </icon>
-      <name>LearnerFlashEnabled</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-      <body-content>empty</body-content>
-
-   </tag>
-   <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -304,6 +273,11 @@
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
+			<name>index</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
 			<name>indexed</name>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
@@ -456,12 +430,8 @@
    	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
-   	</tag-file>   	
+   	</tag-file>
    	<tag-file>
-       <name>Passon</name>
-       <path>/WEB-INF/tags/Passon.tag</path>
-   	</tag-file>  
-   	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
    	</tag-file>  
@@ -507,15 +477,6 @@
         <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
-  	<tag>
-	  	<description>Checks whether Flash enabled for learner</description>
-	  	<display-name>Checks whether Flash enabled for learner</display-name>
-	 	<icon>    
-	 	</icon>
-	 	<name>LearnerFlashEnabled</name>
-	 	<tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-	 	<body-content>empty</body-content>
- 	</tag> 
 	<tag-file>
 		<name>head</name>
 	    <path>/WEB-INF/tags/Head.tag</path>
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_tool_notebook/web/WEB-INF/tags/Passon.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -28,26 +28,6 @@
    </tag>
    <tag>
 
-      <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-      <display-name>generate unique ID</display-name>
-      <icon>    
-      </icon>
-      <name>generateID</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.GenerateIDTag</tag-class>
-      <body-content>empty</body-content>
-
-      <attribute>
-         <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-         <name>id</name>
-         <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-
-   </tag>
-   <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
@@ -191,17 +171,6 @@
    </tag>
    <tag>
 
-      <description>Checks whether Flash enabled for learner</description>
-      <display-name>Checks whether Flash enabled for learner</display-name>
-      <icon>    
-      </icon>
-      <name>LearnerFlashEnabled</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-      <body-content>empty</body-content>
-
-   </tag>
-   <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -304,6 +273,11 @@
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
+			<name>index</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
 			<name>indexed</name>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
@@ -456,12 +430,8 @@
    	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
-   	</tag-file>   	
+   	</tag-file>
    	<tag-file>
-       <name>Passon</name>
-       <path>/WEB-INF/tags/Passon.tag</path>
-   	</tag-file>  
-   	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
    	</tag-file>  
@@ -507,15 +477,6 @@
         <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
-  	<tag>
-	  	<description>Checks whether Flash enabled for learner</description>
-	  	<display-name>Checks whether Flash enabled for learner</display-name>
-	 	<icon>    
-	 	</icon>
-	 	<name>LearnerFlashEnabled</name>
-	 	<tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-	 	<body-content>empty</body-content>
- 	</tag> 
 	<tag-file>
 		<name>head</name>
 	    <path>/WEB-INF/tags/Head.tag</path>
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_tool_pixlr/web/WEB-INF/tags/Passon.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -28,26 +28,6 @@
    </tag>
    <tag>
 
-      <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-      <display-name>generate unique ID</display-name>
-      <icon>    
-      </icon>
-      <name>generateID</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.GenerateIDTag</tag-class>
-      <body-content>empty</body-content>
-
-      <attribute>
-         <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-         <name>id</name>
-         <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-
-   </tag>
-   <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
@@ -191,17 +171,6 @@
    </tag>
    <tag>
 
-      <description>Checks whether Flash enabled for learner</description>
-      <display-name>Checks whether Flash enabled for learner</display-name>
-      <icon>    
-      </icon>
-      <name>LearnerFlashEnabled</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-      <body-content>empty</body-content>
-
-   </tag>
-   <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -304,6 +273,11 @@
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
+			<name>index</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
 			<name>indexed</name>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
@@ -456,12 +430,8 @@
    	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
-   	</tag-file>   	
+   	</tag-file>
    	<tag-file>
-       <name>Passon</name>
-       <path>/WEB-INF/tags/Passon.tag</path>
-   	</tag-file>  
-   	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
    	</tag-file>  
@@ -507,15 +477,6 @@
         <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
-  	<tag>
-	  	<description>Checks whether Flash enabled for learner</description>
-	  	<display-name>Checks whether Flash enabled for learner</display-name>
-	 	<icon>    
-	 	</icon>
-	 	<name>LearnerFlashEnabled</name>
-	 	<tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-	 	<body-content>empty</body-content>
- 	</tag> 
 	<tag-file>
 		<name>head</name>
 	    <path>/WEB-INF/tags/Head.tag</path>
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_tool_sbmt/web/WEB-INF/tags/Passon.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_sbmt/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_tool_sbmt/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_sbmt/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -28,26 +28,6 @@
    </tag>
    <tag>
 
-      <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-      <display-name>generate unique ID</display-name>
-      <icon>    
-      </icon>
-      <name>generateID</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.GenerateIDTag</tag-class>
-      <body-content>empty</body-content>
-
-      <attribute>
-         <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-         <name>id</name>
-         <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-
-   </tag>
-   <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
@@ -191,17 +171,6 @@
    </tag>
    <tag>
 
-      <description>Checks whether Flash enabled for learner</description>
-      <display-name>Checks whether Flash enabled for learner</display-name>
-      <icon>    
-      </icon>
-      <name>LearnerFlashEnabled</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-      <body-content>empty</body-content>
-
-   </tag>
-   <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -304,6 +273,11 @@
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
+			<name>index</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
 			<name>indexed</name>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
@@ -456,12 +430,8 @@
    	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
-   	</tag-file>   	
+   	</tag-file>
    	<tag-file>
-       <name>Passon</name>
-       <path>/WEB-INF/tags/Passon.tag</path>
-   	</tag-file>  
-   	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
    	</tag-file>  
@@ -507,15 +477,6 @@
         <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
-  	<tag>
-	  	<description>Checks whether Flash enabled for learner</description>
-	  	<display-name>Checks whether Flash enabled for learner</display-name>
-	 	<icon>    
-	 	</icon>
-	 	<name>LearnerFlashEnabled</name>
-	 	<tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-	 	<body-content>empty</body-content>
- 	</tag> 
 	<tag-file>
 		<name>head</name>
 	    <path>/WEB-INF/tags/Head.tag</path>
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_tool_scratchie/web/WEB-INF/tags/Passon.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_tool_scribe/web/WEB-INF/tags/Passon.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rd56929f06ad90a63082d514e6521adc175f3de27 -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision d56929f06ad90a63082d514e6521adc175f3de27)
+++ lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -28,26 +28,6 @@
    </tag>
    <tag>
 
-      <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-      <display-name>generate unique ID</display-name>
-      <icon>    
-      </icon>
-      <name>generateID</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.GenerateIDTag</tag-class>
-      <body-content>empty</body-content>
-
-      <attribute>
-         <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-         <name>id</name>
-         <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-
-   </tag>
-   <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
@@ -191,17 +171,6 @@
    </tag>
    <tag>
 
-      <description>Checks whether Flash enabled for learner</description>
-      <display-name>Checks whether Flash enabled for learner</display-name>
-      <icon>    
-      </icon>
-      <name>LearnerFlashEnabled</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-      <body-content>empty</body-content>
-
-   </tag>
-   <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -304,6 +273,11 @@
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
+			<name>index</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
 			<name>indexed</name>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
@@ -456,12 +430,8 @@
    	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
-   	</tag-file>   	
+   	</tag-file>
    	<tag-file>
-       <name>Passon</name>
-       <path>/WEB-INF/tags/Passon.tag</path>
-   	</tag-file>  
-   	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
    	</tag-file>  
@@ -507,15 +477,6 @@
         <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
-  	<tag>
-	  	<description>Checks whether Flash enabled for learner</description>
-	  	<display-name>Checks whether Flash enabled for learner</display-name>
-	 	<icon>    
-	 	</icon>
-	 	<name>LearnerFlashEnabled</name>
-	 	<tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-	 	<body-content>empty</body-content>
- 	</tag> 
 	<tag-file>
 		<name>head</name>
 	    <path>/WEB-INF/tags/Head.tag</path>
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_tool_spreadsheet/web/WEB-INF/tags/Passon.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_spreadsheet/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rd56929f06ad90a63082d514e6521adc175f3de27 -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_tool_spreadsheet/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision d56929f06ad90a63082d514e6521adc175f3de27)
+++ lams_tool_spreadsheet/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -28,26 +28,6 @@
    </tag>
    <tag>
 
-      <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-      <display-name>generate unique ID</display-name>
-      <icon>    
-      </icon>
-      <name>generateID</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.GenerateIDTag</tag-class>
-      <body-content>empty</body-content>
-
-      <attribute>
-         <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-         <name>id</name>
-         <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-
-   </tag>
-   <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
@@ -191,17 +171,6 @@
    </tag>
    <tag>
 
-      <description>Checks whether Flash enabled for learner</description>
-      <display-name>Checks whether Flash enabled for learner</display-name>
-      <icon>    
-      </icon>
-      <name>LearnerFlashEnabled</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-      <body-content>empty</body-content>
-
-   </tag>
-   <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -304,6 +273,11 @@
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
+			<name>index</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
 			<name>indexed</name>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
@@ -456,12 +430,8 @@
    	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
-   	</tag-file>   	
+   	</tag-file>
    	<tag-file>
-       <name>Passon</name>
-       <path>/WEB-INF/tags/Passon.tag</path>
-   	</tag-file>  
-   	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
    	</tag-file>  
@@ -507,15 +477,6 @@
         <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
-  	<tag>
-	  	<description>Checks whether Flash enabled for learner</description>
-	  	<display-name>Checks whether Flash enabled for learner</display-name>
-	 	<icon>    
-	 	</icon>
-	 	<name>LearnerFlashEnabled</name>
-	 	<tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-	 	<body-content>empty</body-content>
- 	</tag> 
 	<tag-file>
 		<name>head</name>
 	    <path>/WEB-INF/tags/Head.tag</path>
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_tool_survey/web/WEB-INF/tags/Passon.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -28,26 +28,6 @@
    </tag>
    <tag>
 
-      <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-      <display-name>generate unique ID</display-name>
-      <icon>    
-      </icon>
-      <name>generateID</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.GenerateIDTag</tag-class>
-      <body-content>empty</body-content>
-
-      <attribute>
-         <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-         <name>id</name>
-         <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-
-   </tag>
-   <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
@@ -191,17 +171,6 @@
    </tag>
    <tag>
 
-      <description>Checks whether Flash enabled for learner</description>
-      <display-name>Checks whether Flash enabled for learner</display-name>
-      <icon>    
-      </icon>
-      <name>LearnerFlashEnabled</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-      <body-content>empty</body-content>
-
-   </tag>
-   <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -304,6 +273,11 @@
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
+			<name>index</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
 			<name>indexed</name>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
@@ -456,12 +430,8 @@
    	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
-   	</tag-file>   	
+   	</tag-file>
    	<tag-file>
-       <name>Passon</name>
-       <path>/WEB-INF/tags/Passon.tag</path>
-   	</tag-file>  
-   	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
    	</tag-file>  
@@ -507,15 +477,6 @@
         <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
-  	<tag>
-	  	<description>Checks whether Flash enabled for learner</description>
-	  	<display-name>Checks whether Flash enabled for learner</display-name>
-	 	<icon>    
-	 	</icon>
-	 	<name>LearnerFlashEnabled</name>
-	 	<tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-	 	<body-content>empty</body-content>
- 	</tag> 
 	<tag-file>
 		<name>head</name>
 	    <path>/WEB-INF/tags/Head.tag</path>
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_tool_task/web/WEB-INF/tags/Passon.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_task/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rfc7e9d5382464db874acd265db7ec003c9472d12 -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_tool_task/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision fc7e9d5382464db874acd265db7ec003c9472d12)
+++ lams_tool_task/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -28,26 +28,6 @@
    </tag>
    <tag>
 
-      <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-      <display-name>generate unique ID</display-name>
-      <icon>    
-      </icon>
-      <name>generateID</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.GenerateIDTag</tag-class>
-      <body-content>empty</body-content>
-
-      <attribute>
-         <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-         <name>id</name>
-         <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-
-   </tag>
-   <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
@@ -191,17 +171,6 @@
    </tag>
    <tag>
 
-      <description>Checks whether Flash enabled for learner</description>
-      <display-name>Checks whether Flash enabled for learner</display-name>
-      <icon>    
-      </icon>
-      <name>LearnerFlashEnabled</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-      <body-content>empty</body-content>
-
-   </tag>
-   <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -461,12 +430,8 @@
    	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
-   	</tag-file>   	
+   	</tag-file>
    	<tag-file>
-       <name>Passon</name>
-       <path>/WEB-INF/tags/Passon.tag</path>
-   	</tag-file>  
-   	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
    	</tag-file>  
@@ -512,15 +477,6 @@
         <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
-  	<tag>
-	  	<description>Checks whether Flash enabled for learner</description>
-	  	<display-name>Checks whether Flash enabled for learner</display-name>
-	 	<icon>    
-	 	</icon>
-	 	<name>LearnerFlashEnabled</name>
-	 	<tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-	 	<body-content>empty</body-content>
- 	</tag> 
 	<tag-file>
 		<name>head</name>
 	    <path>/WEB-INF/tags/Head.tag</path>
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/tags/Passon.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_videorecorder/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rd56929f06ad90a63082d514e6521adc175f3de27 -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_tool_videorecorder/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision d56929f06ad90a63082d514e6521adc175f3de27)
+++ lams_tool_videorecorder/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -28,26 +28,6 @@
    </tag>
    <tag>
 
-      <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-      <display-name>generate unique ID</display-name>
-      <icon>    
-      </icon>
-      <name>generateID</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.GenerateIDTag</tag-class>
-      <body-content>empty</body-content>
-
-      <attribute>
-         <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-         <name>id</name>
-         <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-
-   </tag>
-   <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
@@ -191,17 +171,6 @@
    </tag>
    <tag>
 
-      <description>Checks whether Flash enabled for learner</description>
-      <display-name>Checks whether Flash enabled for learner</display-name>
-      <icon>    
-      </icon>
-      <name>LearnerFlashEnabled</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-      <body-content>empty</body-content>
-
-   </tag>
-   <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -304,6 +273,11 @@
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
+			<name>index</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
 			<name>indexed</name>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
@@ -456,12 +430,8 @@
    	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
-   	</tag-file>   	
+   	</tag-file>
    	<tag-file>
-       <name>Passon</name>
-       <path>/WEB-INF/tags/Passon.tag</path>
-   	</tag-file>  
-   	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
    	</tag-file>  
@@ -507,15 +477,6 @@
         <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
-  	<tag>
-	  	<description>Checks whether Flash enabled for learner</description>
-	  	<display-name>Checks whether Flash enabled for learner</display-name>
-	 	<icon>    
-	 	</icon>
-	 	<name>LearnerFlashEnabled</name>
-	 	<tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-	 	<body-content>empty</body-content>
- 	</tag> 
 	<tag-file>
 		<name>head</name>
 	    <path>/WEB-INF/tags/Head.tag</path>
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_tool_vote/web/WEB-INF/tags/Passon.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -28,26 +28,6 @@
    </tag>
    <tag>
 
-      <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-      <display-name>generate unique ID</display-name>
-      <icon>    
-      </icon>
-      <name>generateID</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.GenerateIDTag</tag-class>
-      <body-content>empty</body-content>
-
-      <attribute>
-         <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-         <name>id</name>
-         <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-
-   </tag>
-   <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
@@ -191,17 +171,6 @@
    </tag>
    <tag>
 
-      <description>Checks whether Flash enabled for learner</description>
-      <display-name>Checks whether Flash enabled for learner</display-name>
-      <icon>    
-      </icon>
-      <name>LearnerFlashEnabled</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-      <body-content>empty</body-content>
-
-   </tag>
-   <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -304,6 +273,11 @@
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
+			<name>index</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
 			<name>indexed</name>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
@@ -456,12 +430,8 @@
    	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
-   	</tag-file>   	
+   	</tag-file>
    	<tag-file>
-       <name>Passon</name>
-       <path>/WEB-INF/tags/Passon.tag</path>
-   	</tag-file>  
-   	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
    	</tag-file>  
@@ -507,15 +477,6 @@
         <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
-  	<tag>
-	  	<description>Checks whether Flash enabled for learner</description>
-	  	<display-name>Checks whether Flash enabled for learner</display-name>
-	 	<icon>    
-	 	</icon>
-	 	<name>LearnerFlashEnabled</name>
-	 	<tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-	 	<body-content>empty</body-content>
- 	</tag> 
 	<tag-file>
 		<name>head</name>
 	    <path>/WEB-INF/tags/Head.tag</path>
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_tool_wiki/web/WEB-INF/tags/Passon.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -28,26 +28,6 @@
    </tag>
    <tag>
 
-      <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-      <display-name>generate unique ID</display-name>
-      <icon>    
-      </icon>
-      <name>generateID</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.GenerateIDTag</tag-class>
-      <body-content>empty</body-content>
-
-      <attribute>
-         <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-         <name>id</name>
-         <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-
-   </tag>
-   <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
@@ -191,17 +171,6 @@
    </tag>
    <tag>
 
-      <description>Checks whether Flash enabled for learner</description>
-      <display-name>Checks whether Flash enabled for learner</display-name>
-      <icon>    
-      </icon>
-      <name>LearnerFlashEnabled</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-      <body-content>empty</body-content>
-
-   </tag>
-   <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -304,6 +273,11 @@
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
+			<name>index</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
 			<name>indexed</name>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
@@ -456,12 +430,8 @@
    	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
-   	</tag-file>   	
+   	</tag-file>
    	<tag-file>
-       <name>Passon</name>
-       <path>/WEB-INF/tags/Passon.tag</path>
-   	</tag-file>  
-   	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
    	</tag-file>  
@@ -507,15 +477,6 @@
         <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
-  	<tag>
-	  	<description>Checks whether Flash enabled for learner</description>
-	  	<display-name>Checks whether Flash enabled for learner</display-name>
-	 	<icon>    
-	 	</icon>
-	 	<name>LearnerFlashEnabled</name>
-	 	<tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-	 	<body-content>empty</body-content>
- 	</tag> 
 	<tag-file>
 		<name>head</name>
 	    <path>/WEB-INF/tags/Head.tag</path>
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_tool_wookie/web/WEB-INF/tags/Passon.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_wookie/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_tool_wookie/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_wookie/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -28,26 +28,6 @@
    </tag>
    <tag>
 
-      <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-      <display-name>generate unique ID</display-name>
-      <icon>    
-      </icon>
-      <name>generateID</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.GenerateIDTag</tag-class>
-      <body-content>empty</body-content>
-
-      <attribute>
-         <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-         <name>id</name>
-         <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-
-   </tag>
-   <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
@@ -191,17 +171,6 @@
    </tag>
    <tag>
 
-      <description>Checks whether Flash enabled for learner</description>
-      <display-name>Checks whether Flash enabled for learner</display-name>
-      <icon>    
-      </icon>
-      <name>LearnerFlashEnabled</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-      <body-content>empty</body-content>
-
-   </tag>
-   <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -304,6 +273,11 @@
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
+			<name>index</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
 			<name>indexed</name>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
@@ -456,12 +430,8 @@
    	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
-   	</tag-file>   	
+   	</tag-file>
    	<tag-file>
-       <name>Passon</name>
-       <path>/WEB-INF/tags/Passon.tag</path>
-   	</tag-file>  
-   	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
    	</tag-file>  
@@ -507,15 +477,6 @@
         <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
-  	<tag>
-	  	<description>Checks whether Flash enabled for learner</description>
-	  	<display-name>Checks whether Flash enabled for learner</display-name>
-	 	<icon>    
-	 	</icon>
-	 	<name>LearnerFlashEnabled</name>
-	 	<tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-	 	<body-content>empty</body-content>
- 	</tag> 
 	<tag-file>
 		<name>head</name>
 	    <path>/WEB-INF/tags/Head.tag</path>
Fisheye: Tag 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_www/web/WEB-INF/tags/Passon.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_www/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rd56929f06ad90a63082d514e6521adc175f3de27 -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_www/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision d56929f06ad90a63082d514e6521adc175f3de27)
+++ lams_www/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -28,26 +28,6 @@
    </tag>
    <tag>
 
-      <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-      <display-name>generate unique ID</display-name>
-      <icon>    
-      </icon>
-      <name>generateID</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.GenerateIDTag</tag-class>
-      <body-content>empty</body-content>
-
-      <attribute>
-         <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-         <name>id</name>
-         <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-
-   </tag>
-   <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
@@ -191,17 +171,6 @@
    </tag>
    <tag>
 
-      <description>Checks whether Flash enabled for learner</description>
-      <display-name>Checks whether Flash enabled for learner</display-name>
-      <icon>    
-      </icon>
-      <name>LearnerFlashEnabled</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-      <body-content>empty</body-content>
-
-   </tag>
-   <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -304,6 +273,11 @@
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
+			<name>index</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
 			<name>indexed</name>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
@@ -456,12 +430,8 @@
    	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
-   	</tag-file>   	
+   	</tag-file>
    	<tag-file>
-       <name>Passon</name>
-       <path>/WEB-INF/tags/Passon.tag</path>
-   	</tag-file>  
-   	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
    	</tag-file>  
@@ -507,15 +477,6 @@
         <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
-  	<tag>
-	  	<description>Checks whether Flash enabled for learner</description>
-	  	<display-name>Checks whether Flash enabled for learner</display-name>
-	 	<icon>    
-	 	</icon>
-	 	<name>LearnerFlashEnabled</name>
-	 	<tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-	 	<body-content>empty</body-content>
- 	</tag> 
 	<tag-file>
 		<name>head</name>
 	    <path>/WEB-INF/tags/Head.tag</path>