Index: lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java
===================================================================
diff -u -r715b8aae1297fe15f7a0a65c52e39b50cae4c157 -rf1eb1c8bf31d29527586c784015f6e1903892c0e
--- lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java (.../HomeAction.java) (revision 715b8aae1297fe15f7a0a65c52e39b50cae4c157)
+++ lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java (.../HomeAction.java) (revision f1eb1c8bf31d29527586c784015f6e1903892c0e)
@@ -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
===================================================================
diff -u -r3690e7d302826a39135066317dfa6d8c830ec067 -rf1eb1c8bf31d29527586c784015f6e1903892c0e
--- lams_learning/conf/xdoclet/filter-mappings.xml (.../filter-mappings.xml) (revision 3690e7d302826a39135066317dfa6d8c830ec067)
+++ lams_learning/conf/xdoclet/filter-mappings.xml (.../filter-mappings.xml) (revision f1eb1c8bf31d29527586c784015f6e1903892c0e)
@@ -3,6 +3,11 @@
/layout/supportMobileVersionLayout.jsp
FORWARD
+
+ UrlRewriteFilter
+ /main.jsp
+ FORWARD
+
HibernateFilter
Index: lams_learning/web/WEB-INF/urlrewrite.xml
===================================================================
diff -u -rb600b6d036e00137bf23359f5ad27a24702f3550 -rf1eb1c8bf31d29527586c784015f6e1903892c0e
--- lams_learning/web/WEB-INF/urlrewrite.xml (.../urlrewrite.xml) (revision b600b6d036e00137bf23359f5ad27a24702f3550)
+++ lams_learning/web/WEB-INF/urlrewrite.xml (.../urlrewrite.xml) (revision f1eb1c8bf31d29527586c784015f6e1903892c0e)
@@ -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/main.jsp
===================================================================
diff -u -r715b8aae1297fe15f7a0a65c52e39b50cae4c157 -rf1eb1c8bf31d29527586c784015f6e1903892c0e
--- lams_learning/web/main.jsp (.../main.jsp) (revision 715b8aae1297fe15f7a0a65c52e39b50cae4c157)
+++ lams_learning/web/main.jsp (.../main.jsp) (revision f1eb1c8bf31d29527586c784015f6e1903892c0e)
@@ -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 @@
- ▼
+ â¼
- ▲
+ â²