Index: lams_central/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/build.xml,v
diff -u -r1.49 -r1.50
--- lams_central/build.xml	6 Oct 2010 10:11:56 -0000	1.49
+++ lams_central/build.xml	1 Apr 2011 21:16:01 -0000	1.50
@@ -167,6 +167,7 @@
 				<include name="struts/**"/>
 				<include name="jstl/**"/>
 				<include name="ckeditor/**"/>
+				<include name="lib/**"/>
 				<include name="tiles/**"/>
 				<exclude name="web.xml"/>
 			</webinf>
Index: lams_central/conf/xdoclet/filter-mappings.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/xdoclet/filter-mappings.xml,v
diff -u -r1.11 -r1.12
--- lams_central/conf/xdoclet/filter-mappings.xml	6 Oct 2010 10:11:47 -0000	1.11
+++ lams_central/conf/xdoclet/filter-mappings.xml	1 Apr 2011 21:16:01 -0000	1.12
@@ -1,4 +1,10 @@
 <filter-mapping>
+    	<filter-name>UrlRewriteFilter</filter-name>
+        <url-pattern>/learner.jsp</url-pattern>
+        <dispatcher>FORWARD</dispatcher>
+</filter-mapping>
+
+<filter-mapping>
 	<filter-name>SystemSessionFilter</filter-name>
 	<url-pattern>*.do</url-pattern>
 </filter-mapping>
Index: lams_central/conf/xdoclet/filters.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/xdoclet/filters.xml,v
diff -u -r1.7 -r1.8
--- lams_central/conf/xdoclet/filters.xml	17 Mar 2010 00:09:45 -0000	1.7
+++ lams_central/conf/xdoclet/filters.xml	1 Apr 2011 21:16:01 -0000	1.8
@@ -1,4 +1,9 @@
 <filter>
+        <filter-name>UrlRewriteFilter</filter-name>
+        <filter-class>org.tuckey.web.filters.urlrewrite.UrlRewriteFilter</filter-class>
+</filter>
+
+<filter>
 	<filter-name>SystemSessionFilter</filter-name>
 	<filter-class>
 		org.lamsfoundation.lams.web.session.SystemSessionFilter
Index: lams_central/web/learner.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/Attic/learner.jsp,v
diff -u -r1.18 -r1.19
--- lams_central/web/learner.jsp	1 Apr 2009 00:45:17 -0000	1.18
+++ lams_central/web/learner.jsp	1 Apr 2011 21:16:01 -0000	1.19
@@ -9,10 +9,11 @@
 <lams:html>
 <lams:head>
 
+<c:set var="forceMobileDevToUseFlashless"><lams:Configuration key="ForceMobileDevToUseFlashless"/></c:set>
 <c:set var="enableFlash"><lams:LearnerFlashEnabled/></c:set>
 	
 <c:choose>
-	<c:when test="${enableFlash}">
+	<c:when test="${enableFlash && (!forceMobileDevToUseFlashless || !isMobileDevice)}">
 		<META HTTP-EQUIV="Refresh" CONTENT="0;URL=learning/mainflash.jsp?lessonID=<c:out value="${lessonID}"/>&portfolioEnabled=<c:out value="${portfolioEnabled}"/>&presenceEnabledPatch=<c:out value="${presenceEnabledPatch}"/>&presenceImEnabled=<c:out value="${presenceImEnabled}"/>&presenceUrl=<c:out value="${presenceUrl}"/>&createDateTime=<c:out value="${createDateTime}"/>&title=<c:out value="${title}"/><c:if test="${mode != null}">&mode=<c:out value="${mode}"/></c:if>">
 	</c:when>
 	<c:otherwise>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_central/web/WEB-INF/urlrewrite.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/web/WEB-INF/lib/urlrewrite-3.2.0.jar
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/lib/Attic/urlrewrite-3.2.0.jar,v
diff -u -r1.1 -r1.2
Binary files differ
Index: lams_common/db/sql/insert_lams_unix_config_data.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/db/sql/insert_lams_unix_config_data.sql,v
diff -u -r1.55 -r1.56
--- lams_common/db/sql/insert_lams_unix_config_data.sql	8 Feb 2011 12:08:21 -0000	1.55
+++ lams_common/db/sql/insert_lams_unix_config_data.sql	1 Apr 2011 21:15:57 -0000	1.56
@@ -110,6 +110,9 @@
 values ('DisplayPrintButton','false', 'config.display.print.button', 'config.header.features', 'BOOLEAN', 1);
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('ForceMobileDevToUseFlashless','false', 'config.force.mobile.use.flashlesh', 'config.header.features', 'BOOLEAN', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
 values ('LDAPProvisioningEnabled','false', 'config.ldap.provisioning.enabled', 'config.header.ldap', 'BOOLEAN', 1);
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
Index: lams_common/db/sql/insert_lams_windows_config_data.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/db/sql/insert_lams_windows_config_data.sql,v
diff -u -r1.49 -r1.50
--- lams_common/db/sql/insert_lams_windows_config_data.sql	8 Feb 2011 12:08:21 -0000	1.49
+++ lams_common/db/sql/insert_lams_windows_config_data.sql	1 Apr 2011 21:15:57 -0000	1.50
@@ -110,6 +110,9 @@
 values ('DisplayPrintButton','false', 'config.display.print.button', 'config.header.features', 'BOOLEAN', 1);
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('ForceMobileDevToUseFlashless','false', 'config.force.mobile.use.flashlesh', 'config.header.features', 'BOOLEAN', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
 values ('LDAPProvisioningEnabled','false', 'config.ldap.provisioning.enabled', 'config.header.ldap', 'BOOLEAN', 1);
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040006.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040006.sql,v
diff -u -r1.7 -r1.8
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040006.sql	23 Feb 2011 22:20:41 -0000	1.7
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040006.sql	1 Apr 2011 21:15:57 -0000	1.8
@@ -149,5 +149,10 @@
 
 ALTER TABLE lams_planner_nodes DROP COLUMN file_uuid, DROP COLUMN file_name, ADD COLUMN ld_id BIGINT(20), ADD COLUMN teachers_permissions TINYINT UNSIGNED;
 
+-- LDEV-2664 Switch learner interface for learners if they use a mobile device
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('ForceMobileDevToUseFlashless','false', 'config.force.mobile.use.flashlesh', 'config.header.features', 'BOOLEAN', 1);
+
+
 COMMIT;
 SET AUTOCOMMIT = 1;
\ No newline at end of file