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.68 -r1.69
--- lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java 14 Aug 2015 07:34:57 -0000 1.68
+++ lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java 15 Aug 2015 21:21:43 -0000 1.69
@@ -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 -r1.10
--- lams_learning/conf/xdoclet/filter-mappings.xml 27 Feb 2013 14:02:46 -0000 1.9
+++ lams_learning/conf/xdoclet/filter-mappings.xml 15 Aug 2015 21:21:39 -0000 1.10
@@ -3,6 +3,11 @@
/layout/supportMobileVersionLayout.jsp
FORWARD
+
+ UrlRewriteFilter
+ /main.jsp
+ FORWARD
+
HibernateFilter
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_learning/web/index.jsp'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_learning/web/main.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/main.jsp,v
diff -u -r1.38 -r1.39
--- lams_learning/web/main.jsp 14 Aug 2015 07:34:56 -0000 1.38
+++ lams_learning/web/main.jsp 15 Aug 2015 21:21:40 -0000 1.39
@@ -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"%>
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.2
--- lams_learning/web/WEB-INF/urlrewrite.xml 27 Feb 2013 14:02:46 -0000 1.1
+++ lams_learning/web/WEB-INF/urlrewrite.xml 15 Aug 2015 21:21:39 -0000 1.2
@@ -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 -r1.2
--- lams_learning/web/mobile/main.jsp 14 Aug 2015 07:34:56 -0000 1.1
+++ lams_learning/web/mobile/main.jsp 15 Aug 2015 21:21:40 -0000 1.2
@@ -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" %>