Index: lams_tool_nb/build.xml =================================================================== diff -u -r5a99fbbdf8c9f0bf8e429616f54078b212cc96b3 -r93aa85a72fd9f1ae7500829c8371d4b90765a1b1 --- lams_tool_nb/build.xml (.../build.xml) (revision 5a99fbbdf8c9f0bf8e429616f54078b212cc96b3) +++ lams_tool_nb/build.xml (.../build.xml) (revision 93aa85a72fd9f1ae7500829c8371d4b90765a1b1) @@ -221,6 +221,7 @@ + Index: lams_tool_nb/conf/xdoclet/filter-mappings.xml =================================================================== diff -u -r8f07317c71b1749ef616c0d42f5b49e9a14c43a8 -r93aa85a72fd9f1ae7500829c8371d4b90765a1b1 --- lams_tool_nb/conf/xdoclet/filter-mappings.xml (.../filter-mappings.xml) (revision 8f07317c71b1749ef616c0d42f5b49e9a14c43a8) +++ lams_tool_nb/conf/xdoclet/filter-mappings.xml (.../filter-mappings.xml) (revision 93aa85a72fd9f1ae7500829c8371d4b90765a1b1) @@ -1,4 +1,11 @@ + UrlRewriteFilter + /* + REQUEST + FORWARD + + + SystemSessionFilter /* @@ -8,7 +15,7 @@ /* - - LocaleFilter - /* - \ No newline at end of file + + LocaleFilter + /* + \ No newline at end of file Index: lams_tool_nb/conf/xdoclet/filters.xml =================================================================== diff -u -r126d84999e520648cb187e465cb4aaa3baad222e -r93aa85a72fd9f1ae7500829c8371d4b90765a1b1 --- lams_tool_nb/conf/xdoclet/filters.xml (.../filters.xml) (revision 126d84999e520648cb187e465cb4aaa3baad222e) +++ lams_tool_nb/conf/xdoclet/filters.xml (.../filters.xml) (revision 93aa85a72fd9f1ae7500829c8371d4b90765a1b1) @@ -9,11 +9,16 @@ --> + UrlRewriteFilter + org.tuckey.web.filters.urlrewrite.UrlRewriteFilter + + + SystemSessionFilter org.lamsfoundation.lams.web.session.SystemSessionFilter - + hibernateFilter org.lamsfoundation.lams.util.CustomizedOpenSessionInViewFilter @@ -22,7 +27,7 @@ sessionFactoryBeanName coreSessionFactory - + LocaleFilter Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringAction.java =================================================================== diff -u -r0e74773075ee5caec97c424a716df82265e1ba48 -r93aa85a72fd9f1ae7500829c8371d4b90765a1b1 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringAction.java (.../NbAuthoringAction.java) (revision 0e74773075ee5caec97c424a716df82265e1ba48) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringAction.java (.../NbAuthoringAction.java) (revision 93aa85a72fd9f1ae7500829c8371d4b90765a1b1) @@ -82,7 +82,6 @@ * parameter="method" validate="true" input="/author_page.jsp" * * @struts:action-forward name="authoringContent" path="/authoring/authoring.jsp" - * @struts:action-forward name="displayMessage" path=".message" * * ----------------XDoclet Tags-------------------- */ Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringAction.java =================================================================== diff -u -rf621e87b80149d33e8a6a3bd10137dc31acce569 -r93aa85a72fd9f1ae7500829c8371d4b90765a1b1 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringAction.java (.../NbMonitoringAction.java) (revision f621e87b80149d33e8a6a3bd10137dc31acce569) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringAction.java (.../NbMonitoringAction.java) (revision 93aa85a72fd9f1ae7500829c8371d4b90765a1b1) @@ -70,7 +70,7 @@ * @struts:action path="/monitoring" name="NbMonitoringForm" scope="request" type="org.lamsfoundation.lams.tool.noticeboard.web.NbMonitoringAction" * input=".monitoringContent" validate="false" parameter="method" * @struts:action-forward name="monitorPage" path="/monitoring/monitoring.jsp" - * @struts:action-forward name="monitorReflectionPage" path=".monitorReflectionPage" + * @struts:action-forward name="monitorReflectionPage" path="/monitoring/reflection.jsp" * ----------------XDoclet Tags-------------------- */ public class NbMonitoringAction extends LamsDispatchAction { Index: lams_tool_nb/web/WEB-INF/struts-config.xml =================================================================== diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -r93aa85a72fd9f1ae7500829c8371d4b90765a1b1 --- lams_tool_nb/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision 8179037dc958585c054547eb7de9be14c6aed233) +++ lams_tool_nb/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision 93aa85a72fd9f1ae7500829c8371d4b90765a1b1) @@ -90,7 +90,7 @@ /> @@ -177,11 +177,6 @@ path="/authoring/authoring.jsp" redirect="false" /> - Index: lams_tool_nb/web/WEB-INF/tiles/tiles-defs.xml =================================================================== diff -u -ra8b982a6f7fe38b9a53aeed101ca2b5015cc2d2c -r93aa85a72fd9f1ae7500829c8371d4b90765a1b1 --- lams_tool_nb/web/WEB-INF/tiles/tiles-defs.xml (.../tiles-defs.xml) (revision a8b982a6f7fe38b9a53aeed101ca2b5015cc2d2c) +++ lams_tool_nb/web/WEB-INF/tiles/tiles-defs.xml (.../tiles-defs.xml) (revision 93aa85a72fd9f1ae7500829c8371d4b90765a1b1) @@ -30,25 +30,25 @@ - + + - + + + + - - - - Index: lams_tool_nb/web/WEB-INF/urlrewrite.xml =================================================================== diff -u --- lams_tool_nb/web/WEB-INF/urlrewrite.xml (revision 0) +++ lams_tool_nb/web/WEB-INF/urlrewrite.xml (revision 93aa85a72fd9f1ae7500829c8371d4b90765a1b1) @@ -0,0 +1,26 @@ + + + + + + + + + The rule means that 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 + ^(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 + ^/template/learnerTemplate.jsp$ + /template/mobileLearnerTemplate.jsp + + + + Index: lams_tool_nb/web/WEB-INF/web.xml =================================================================== diff -u -r0e74773075ee5caec97c424a716df82265e1ba48 -r93aa85a72fd9f1ae7500829c8371d4b90765a1b1 --- lams_tool_nb/web/WEB-INF/web.xml (.../web.xml) (revision 0e74773075ee5caec97c424a716df82265e1ba48) +++ lams_tool_nb/web/WEB-INF/web.xml (.../web.xml) (revision 93aa85a72fd9f1ae7500829c8371d4b90765a1b1) @@ -34,11 +34,16 @@ --> + UrlRewriteFilter + org.tuckey.web.filters.urlrewrite.UrlRewriteFilter + + + SystemSessionFilter org.lamsfoundation.lams.web.session.SystemSessionFilter - + hibernateFilter org.lamsfoundation.lams.util.CustomizedOpenSessionInViewFilter @@ -47,7 +52,7 @@ sessionFactoryBeanName coreSessionFactory - + LocaleFilter @@ -61,6 +66,13 @@ + UrlRewriteFilter + /* + REQUEST + FORWARD + + + SystemSessionFilter /* @@ -70,10 +82,10 @@ /* - - LocaleFilter - /* - + + LocaleFilter + /* + Index: lams_tool_nb/web/learning/mobile/defineLater.jsp =================================================================== diff -u --- lams_tool_nb/web/learning/mobile/defineLater.jsp (revision 0) +++ lams_tool_nb/web/learning/mobile/defineLater.jsp (revision 93aa85a72fd9f1ae7500829c8371d4b90765a1b1) @@ -0,0 +1,15 @@ +<%@ include file="/includes/taglibs.jsp"%> + +
+

+ +

+
+ +
+ +
+ +
+

 

+
Index: lams_tool_nb/web/learning/mobile/learnerContent.jsp =================================================================== diff -u --- lams_tool_nb/web/learning/mobile/learnerContent.jsp (revision 0) +++ lams_tool_nb/web/learning/mobile/learnerContent.jsp (revision 93aa85a72fd9f1ae7500829c8371d4b90765a1b1) @@ -0,0 +1,88 @@ +<%@ include file="/includes/taglibs.jsp"%> + + + + +
+

+ +

+
+ + +
+

+ +

+ + + + + + + + + + + + + +
+

+ ${reflectInstructions} +

+ + + +

+ + +

+ +
+ + +

+ +

+
+ +
+ +
+
+
+ +
+ + + + + + + + + + + + + + + +
+
\ No newline at end of file Index: lams_tool_nb/web/learning/mobile/message.jsp =================================================================== diff -u --- lams_tool_nb/web/learning/mobile/message.jsp (revision 0) +++ lams_tool_nb/web/learning/mobile/message.jsp (revision 93aa85a72fd9f1ae7500829c8371d4b90765a1b1) @@ -0,0 +1,56 @@ +<%@ include file="/includes/taglibs.jsp"%> + + + + + + +
+

+ +

+
+ +
+ + +

+ +

+
+
+
+ +
+ + + + + + + + + + + + + + + + + +
+ + Index: lams_tool_nb/web/learning/mobile/reflect.jsp =================================================================== diff -u --- lams_tool_nb/web/learning/mobile/reflect.jsp (revision 0) +++ lams_tool_nb/web/learning/mobile/reflect.jsp (revision 93aa85a72fd9f1ae7500829c8371d4b90765a1b1) @@ -0,0 +1,39 @@ +<%@ include file="/includes/taglibs.jsp"%> + + + +
+

+ +

+
+ + +
+ +
+ + + +
+ +
+ + + + + + + + +
+
Index: lams_tool_nb/web/monitoring/reflection.jsp =================================================================== diff -u -rf393908c737e5401dda3b995bacb6e4c4a5e5a50 -r93aa85a72fd9f1ae7500829c8371d4b90765a1b1 --- lams_tool_nb/web/monitoring/reflection.jsp (.../reflection.jsp) (revision f393908c737e5401dda3b995bacb6e4c4a5e5a50) +++ lams_tool_nb/web/monitoring/reflection.jsp (.../reflection.jsp) (revision 93aa85a72fd9f1ae7500829c8371d4b90765a1b1) @@ -1,28 +1,48 @@ + + <%@ include file="/includes/taglibs.jsp"%> -
+ + + + + + -

- -

+ + + + <fmt:message key="activity.title"/> + - - - - - - - - -
-

- -

-
-

- -

-
+ -
+
+

+ +

+ + + + + + + + + +
+

+ +

+
+

+ +

+
+ +
+ + + Index: lams_tool_nb/web/template/mobileLearnerTemplate.jsp =================================================================== diff -u --- lams_tool_nb/web/template/mobileLearnerTemplate.jsp (revision 0) +++ lams_tool_nb/web/template/mobileLearnerTemplate.jsp (revision 93aa85a72fd9f1ae7500829c8371d4b90765a1b1) @@ -0,0 +1,27 @@ + + +<%@ include file="/includes/taglibs.jsp"%> + + + + + + + + + + + <fmt:message key="activity.title"/> + + + + + + + + +
+ +
+