Index: lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java,v diff -u -r1.60.2.8 -r1.60.2.9 --- lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java 14 Aug 2015 07:41:55 -0000 1.60.2.8 +++ lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java 22 Aug 2015 00:21:04 -0000 1.60.2.9 @@ -232,7 +232,7 @@ + serverURLContextPath; serverURLContextPath += serverURLContextPath.endsWith("/") ? "" : "/"; getServlet().getServletContext().getContext(serverURLContextPath + "learning") - .getRequestDispatcher("/index.jsp").forward(req, res); + .getRequestDispatcher("/main.jsp").forward(req, res); return null; } catch (Exception e) { Index: lams_learning/conf/xdoclet/filter-mappings.xml =================================================================== RCS file: /usr/local/cvsroot/lams_learning/conf/xdoclet/filter-mappings.xml,v diff -u -r1.9.2.1 -r1.9.2.2 --- lams_learning/conf/xdoclet/filter-mappings.xml 1 Dec 2014 14:48:17 -0000 1.9.2.1 +++ lams_learning/conf/xdoclet/filter-mappings.xml 22 Aug 2015 00:21:03 -0000 1.9.2.2 @@ -3,6 +3,11 @@ /layout/supportMobileVersionLayout.jsp FORWARD + + UrlRewriteFilter + /main.jsp + FORWARD + HibernateFilter Index: lams_learning/web/main.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/main.jsp,v diff -u -r1.31.2.6 -r1.31.2.7 --- lams_learning/web/main.jsp 14 Aug 2015 07:41:54 -0000 1.31.2.6 +++ lams_learning/web/main.jsp 22 Aug 2015 00:21:03 -0000 1.31.2.7 @@ -1,3 +1,7 @@ + + +<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%> +<%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-fmt" prefix="fmt"%> <%@ taglib uri="tags-lams" prefix="lams"%> @@ -116,14 +120,14 @@
- ▼ + ▼
- ▲ + ▲
Index: lams_learning/web/WEB-INF/urlrewrite.xml =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/urlrewrite.xml,v diff -u -r1.1 -r1.1.2.1 --- lams_learning/web/WEB-INF/urlrewrite.xml 27 Feb 2013 14:02:46 -0000 1.1 +++ lams_learning/web/WEB-INF/urlrewrite.xml 22 Aug 2015 00:21:03 -0000 1.1.2.1 @@ -12,8 +12,7 @@ - The rule means that requests to tool's learning jsp will be redirected to /learning/mobile/ folder - containing mobile version of jsps. + Requests to tool's learning jsp will be redirected to /learning/mobile/ folder containing mobile version of jsps. Regexes are taken from http://detectmobilebrowser.com/download/jsp. and we might need to update it somewhere in the future. .*(android|avantgo|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|ipad|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 @@ -22,5 +21,14 @@ /layout/mobileLayout.jsp + + + Requests to /learning/main.jsp will be redirected to /learning/mobile/main.jsp. + + .*(ip(hone|od)|ipad).*?i + ^/main.jsp$ + /mobile/main.jsp + + Index: lams_learning/web/mobile/main.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/mobile/main.jsp,v diff -u -r1.1.2.2 -r1.1.2.3 --- lams_learning/web/mobile/main.jsp 14 Aug 2015 07:41:54 -0000 1.1.2.2 +++ lams_learning/web/mobile/main.jsp 22 Aug 2015 00:21:03 -0000 1.1.2.3 @@ -1,3 +1,7 @@ + + +<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%> +<%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-bean" prefix="bean"%> <%@ taglib uri="tags-html" prefix="html"%> <%@ taglib uri="tags-fmt" prefix="fmt" %>