Index: lams_central/build.xml
===================================================================
diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -ra91a7f523070940c179e47c19a3562a20579d0ab
--- lams_central/build.xml	(.../build.xml)	(revision 8179037dc958585c054547eb7de9be14c6aed233)
+++ lams_central/build.xml	(.../build.xml)	(revision a91a7f523070940c179e47c19a3562a20579d0ab)
@@ -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
===================================================================
diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -ra91a7f523070940c179e47c19a3562a20579d0ab
--- lams_central/conf/xdoclet/filter-mappings.xml	(.../filter-mappings.xml)	(revision 8179037dc958585c054547eb7de9be14c6aed233)
+++ lams_central/conf/xdoclet/filter-mappings.xml	(.../filter-mappings.xml)	(revision a91a7f523070940c179e47c19a3562a20579d0ab)
@@ -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
===================================================================
diff -u -r7e3ca8a6361d3d3925fb4c486dfe3b7b6bfb08c5 -ra91a7f523070940c179e47c19a3562a20579d0ab
--- lams_central/conf/xdoclet/filters.xml	(.../filters.xml)	(revision 7e3ca8a6361d3d3925fb4c486dfe3b7b6bfb08c5)
+++ lams_central/conf/xdoclet/filters.xml	(.../filters.xml)	(revision a91a7f523070940c179e47c19a3562a20579d0ab)
@@ -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/WEB-INF/lib/urlrewrite-3.2.0.jar
===================================================================
diff -u
Binary files differ
Index: lams_central/web/WEB-INF/urlrewrite.xml
===================================================================
diff -u
--- lams_central/web/WEB-INF/urlrewrite.xml	(revision 0)
+++ lams_central/web/WEB-INF/urlrewrite.xml	(revision a91a7f523070940c179e47c19a3562a20579d0ab)
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE urlrewrite PUBLIC "-//tuckey.org//DTD UrlRewrite 3.2//EN"
+        "http://tuckey.org/res/dtds/urlrewrite3.2.dtd">
+
+<!--
+
+    Configuration file for UrlRewriteFilter
+    http://tuckey.org/urlrewrite/
+
+-->
+<urlrewrite>
+
+    <rule>
+        <note>
+            The rule means that requests to /learner.jsp will be added with $mobile parameter so it then will be used in learner.jsp.
+        </note>
+        <condition name="user-agent" next="or">.*(android|avantgo|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\\/|plucker|pocket|psp|symbian|treo|up\\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino).*?i</condition>
+    	<condition name="user-agent">^(1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\\-(n|u)|c55\\/|capi|ccwa|cdm\\-|cell|chtm|cldc|cmd\\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\\-s|devi|dica|dmob|do(c|p)o|ds(12|\\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\\-|_)|g1 u|g560|gene|gf\\-5|g\\-mo|go(\\.w|od)|gr(ad|un)|haie|hcit|hd\\-(m|p|t)|hei\\-|hi(pt|ta)|hp( i|ip)|hs\\-c|ht(c(\\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\\-(20|go|ma)|i230|iac( |\\-|\\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\\/)|klon|kpt |kwc\\-|kyo(c|k)|le(no|xi)|lg( g|\\/(k|l|u)|50|54|e\\-|e\\/|\\-[a-w])|libw|lynx|m1\\-w|m3ga|m50\\/|ma(te|ui|xo)|mc(01|21|ca)|m\\-cr|me(di|rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\\-2|po(ck|rt|se)|prox|psio|pt\\-g|qa\\-a|qc(07|12|21|32|60|\\-[2-7]|i\\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\\-|oo|p\\-)|sdk\\/|se(c(\\-|0|1)|47|mc|nd|ri)|sgh\\-|shar|sie(\\-|m)|sk\\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\\-|v\\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\\-|tdg\\-|tel(i|m)|tim\\-|t\\-mo|to(pl|sh)|ts(70|m\\-|m3|m5)|tx\\-9|up(\\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|xda(\\-|2|g)|yas\\-|your|zeto|zte\\-).*?i</condition>
+        <from>^/learner\.jsp$</from>
+        <set name="isMobileDevice">true</set>
+    </rule>    
+
+
+    <!--
+
+    INSTALLATION
+
+        in your web.xml add...
+
+        <filter>
+            <filter-name>UrlRewriteFilter</filter-name>
+            <filter-class>org.tuckey.web.filters.urlrewrite.UrlRewriteFilter</filter-class>
+            <init-param>
+                <param-name>logLevel</param-name>
+                <param-value>WARN</param-value>
+            </init-param>
+        </filter>
+        <filter-mapping>
+            <filter-name>UrlRewriteFilter</filter-name>
+            <url-pattern>/*</url-pattern>
+        </filter-mapping>
+
+     EXAMPLES
+
+     Redirect one url
+        <rule>
+            <from>/some/old/page.html</from>
+            <to type="redirect">/very/new/page.html</to>
+        </rule>
+
+    Redirect a directory
+        <rule>
+            <from>/some/olddir/(.*)</from>
+            <to type="redirect">/very/newdir/$1</to>
+        </rule>
+
+    Clean a url
+        <rule>
+            <from>/products/([0-9]+)</from>
+            <to>/products/index.jsp?product_id=$1</to>
+        </rule>
+    eg, /products/1234 will be passed on to /products/index.jsp?product_id=1234 without the user noticing.
+
+    Browser detection
+        <rule>
+            <condition name="user-agent">Mozilla/[1-4]</condition>
+            <from>/some/page.html</from>
+            <to>/some/page-for-old-browsers.html</to>
+        </rule>
+    eg, will pass the request for /some/page.html on to /some/page-for-old-browsers.html only for older
+    browsers whose user agent srtings match Mozilla/1, Mozilla/2, Mozilla/3 or Mozilla/4.
+
+    Centralised browser detection
+        <rule>
+            <condition name="user-agent">Mozilla/[1-4]</condition>
+            <set type="request" name="browser">moz</set>
+        </rule>
+    eg, all requests will be checked against the condition and if matched
+    request.setAttribute("browser", "moz") will be called.
+
+    -->
+
+</urlrewrite>
+
Index: lams_central/web/learner.jsp
===================================================================
diff -u -rec61f5d738bce3513b4e5204e011a68476a9c165 -ra91a7f523070940c179e47c19a3562a20579d0ab
--- lams_central/web/learner.jsp	(.../learner.jsp)	(revision ec61f5d738bce3513b4e5204e011a68476a9c165)
+++ lams_central/web/learner.jsp	(.../learner.jsp)	(revision a91a7f523070940c179e47c19a3562a20579d0ab)
@@ -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>
Index: lams_common/db/sql/insert_lams_unix_config_data.sql
===================================================================
diff -u -rb7c51aaeec744ac2ad7eb74c64194251d75540c0 -ra91a7f523070940c179e47c19a3562a20579d0ab
--- lams_common/db/sql/insert_lams_unix_config_data.sql	(.../insert_lams_unix_config_data.sql)	(revision b7c51aaeec744ac2ad7eb74c64194251d75540c0)
+++ lams_common/db/sql/insert_lams_unix_config_data.sql	(.../insert_lams_unix_config_data.sql)	(revision a91a7f523070940c179e47c19a3562a20579d0ab)
@@ -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
===================================================================
diff -u -rb7c51aaeec744ac2ad7eb74c64194251d75540c0 -ra91a7f523070940c179e47c19a3562a20579d0ab
--- lams_common/db/sql/insert_lams_windows_config_data.sql	(.../insert_lams_windows_config_data.sql)	(revision b7c51aaeec744ac2ad7eb74c64194251d75540c0)
+++ lams_common/db/sql/insert_lams_windows_config_data.sql	(.../insert_lams_windows_config_data.sql)	(revision a91a7f523070940c179e47c19a3562a20579d0ab)
@@ -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
===================================================================
diff -u -rc1fca2519602334017fb46e34f8849184a7c541a -ra91a7f523070940c179e47c19a3562a20579d0ab
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040006.sql	(.../patch02040006.sql)	(revision c1fca2519602334017fb46e34f8849184a7c541a)
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040006.sql	(.../patch02040006.sql)	(revision a91a7f523070940c179e47c19a3562a20579d0ab)
@@ -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