Index: lams_central/conf/xdoclet/filter-mappings.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/xdoclet/filter-mappings.xml,v
diff -u -r1.8 -r1.8.10.1
--- lams_central/conf/xdoclet/filter-mappings.xml	11 Apr 2008 00:27:22 -0000	1.8
+++ lams_central/conf/xdoclet/filter-mappings.xml	1 Apr 2011 18:36:28 -0000	1.8.10.1
@@ -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.4 -r1.4.18.1
--- lams_central/conf/xdoclet/filters.xml	15 Feb 2006 05:28:56 -0000	1.4
+++ lams_central/conf/xdoclet/filters.xml	1 Apr 2011 18:36:28 -0000	1.4.18.1
@@ -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.18.6.1
--- lams_central/web/learner.jsp	1 Apr 2009 00:45:17 -0000	1.18
+++ lams_central/web/learner.jsp	1 Apr 2011 18:36:28 -0000	1.18.6.1
@@ -6,13 +6,15 @@
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 
+<c:set var="forceMobileDevToUseFlashless"><lams:Configuration key="ForceMobileDevToUseFlashless"/></c:set>
+
 <lams:html>
 <lams:head>
 
 <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.1.2.1
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.43.2.4.2.7 -r1.43.2.4.2.8
--- lams_common/db/sql/insert_lams_unix_config_data.sql	8 Feb 2011 12:10:19 -0000	1.43.2.4.2.7
+++ lams_common/db/sql/insert_lams_unix_config_data.sql	1 Apr 2011 18:36:31 -0000	1.43.2.4.2.8
@@ -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.35.4.4.2.10 -r1.35.4.4.2.11
--- lams_common/db/sql/insert_lams_windows_config_data.sql	24 Feb 2011 15:00:29 -0000	1.35.4.4.2.10
+++ lams_common/db/sql/insert_lams_windows_config_data.sql	1 Apr 2011 18:36:31 -0000	1.35.4.4.2.11
@@ -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/patch02030501.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/dbupdates/Attic/patch02030501.sql,v
diff -u -r1.1.2.3 -r1.1.2.4
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02030501.sql	15 Feb 2011 20:53:57 -0000	1.1.2.3
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02030501.sql	1 Apr 2011 18:36:31 -0000	1.1.2.4
@@ -1,4 +1,4 @@
--- SQL statements to set the database/lams version at 2.3.4
+-- SQL statements to set the database/lams version at 2.3.6
 
 -- Turn off autocommit, so nothing is committed if there is an error
 SET AUTOCOMMIT = 0;			
@@ -20,6 +20,10 @@
   CONSTRAINT lams_ext_server_lesson_map_fk2 FOREIGN KEY (lesson_id) REFERENCES lams_lesson (lesson_id) ON DELETE CASCADE ON UPDATE CASCADE
 ) TYPE=InnoDB;
 
+-- 	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);
+
 -- If there were no errors, commit and restore autocommit to on
 COMMIT;
 SET AUTOCOMMIT = 1;
\ No newline at end of file