Index: lams_tool_forum/conf/xdoclet/filter-mappings.xml =================================================================== diff -u -ra2ab7ae5cb56dc171f4fd9bebd18d5e1bbae89dd -r456bef8020946d9bae40a5d5010e371407961d27 --- lams_tool_forum/conf/xdoclet/filter-mappings.xml (.../filter-mappings.xml) (revision a2ab7ae5cb56dc171f4fd9bebd18d5e1bbae89dd) +++ lams_tool_forum/conf/xdoclet/filter-mappings.xml (.../filter-mappings.xml) (revision 456bef8020946d9bae40a5d5010e371407961d27) @@ -1,4 +1,10 @@ + UrlRewriteFilter + /* + REQUEST + FORWARD + + hibernateFilter /* Index: lams_tool_forum/conf/xdoclet/filters.xml =================================================================== diff -u -ra2ab7ae5cb56dc171f4fd9bebd18d5e1bbae89dd -r456bef8020946d9bae40a5d5010e371407961d27 --- lams_tool_forum/conf/xdoclet/filters.xml (.../filters.xml) (revision a2ab7ae5cb56dc171f4fd9bebd18d5e1bbae89dd) +++ lams_tool_forum/conf/xdoclet/filters.xml (.../filters.xml) (revision 456bef8020946d9bae40a5d5010e371407961d27) @@ -1,4 +1,21 @@ + UrlRewriteFilter + org.tuckey.web.filters.urlrewrite.UrlRewriteFilter + + confReloadCheckInterval + 3 + + + logLevel + DEBUG + + + confPath + /WEB-INF/urlrewrite.xml + + + + hibernateFilter org.lamsfoundation.lams.util.CustomizedOpenSessionInViewFilter Index: lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml =================================================================== diff -u -r8a8c14627918cc58fa845c2369937bc482d2f6b9 -r456bef8020946d9bae40a5d5010e371407961d27 --- lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml (.../tiles-defs.xml) (revision 8a8c14627918cc58fa845c2369937bc482d2f6b9) +++ lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml (.../tiles-defs.xml) (revision 456bef8020946d9bae40a5d5010e371407961d27) @@ -63,33 +63,40 @@ + + + + + + + Index: lams_tool_forum/web/WEB-INF/urlrewrite.xml =================================================================== diff -u --- lams_tool_forum/web/WEB-INF/urlrewrite.xml (revision 0) +++ lams_tool_forum/web/WEB-INF/urlrewrite.xml (revision 456bef8020946d9bae40a5d5010e371407961d27) @@ -0,0 +1,38 @@ + + + + + + + + + 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 + .*chrome.*?i + ^/includes/learnerLayout.jsp$ + /includes/mobileLearnerLayout.jsp + + + + + Handles the exceptional case of /jsps/learning/viewtopic.jsp which doens't use tiles. + + .*(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 + .*chrome.*?i + ^/jsps/learning/viewtopic.jsp$ + /jsps/learning/mobile/viewtopic.jsp + + + + Index: lams_tool_forum/web/includes/mobileLearnerLayout.jsp =================================================================== diff -u --- lams_tool_forum/web/includes/mobileLearnerLayout.jsp (revision 0) +++ lams_tool_forum/web/includes/mobileLearnerLayout.jsp (revision 456bef8020946d9bae40a5d5010e371407961d27) @@ -0,0 +1,118 @@ + + +<%@ include file="/common/taglibs.jsp"%> + +<%@ taglib uri="tags-tiles" prefix="tiles"%> + + + + + + + + + <fmt:message key="activity.title" /> + + + + + + + + + + + + + + + + + + + + + + Index: lams_tool_forum/web/jsps/learning/mobile/create.jsp =================================================================== diff -u --- lams_tool_forum/web/jsps/learning/mobile/create.jsp (revision 0) +++ lams_tool_forum/web/jsps/learning/mobile/create.jsp (revision 456bef8020946d9bae40a5d5010e371407961d27) @@ -0,0 +1,31 @@ +<%@ include file="/common/taglibs.jsp"%> + +
+ + + + + + + +
+

+ ${sessionMap.title} +

+
+ +
+

+ +

+ + + <%@ include file="/jsps/learning/mobile/message/topicform.jsp"%> +
+
+ +
+

 

+
+ +
\ No newline at end of file Index: lams_tool_forum/web/jsps/learning/mobile/definelater.jsp =================================================================== diff -u --- lams_tool_forum/web/jsps/learning/mobile/definelater.jsp (revision 0) +++ lams_tool_forum/web/jsps/learning/mobile/definelater.jsp (revision 456bef8020946d9bae40a5d5010e371407961d27) @@ -0,0 +1,13 @@ +<%@ include file="/includes/taglibs.jsp"%> + +
+

+ +

+ +
+ + + + + Index: lams_tool_forum/web/jsps/learning/mobile/edit.jsp =================================================================== diff -u --- lams_tool_forum/web/jsps/learning/mobile/edit.jsp (revision 0) +++ lams_tool_forum/web/jsps/learning/mobile/edit.jsp (revision 456bef8020946d9bae40a5d5010e371407961d27) @@ -0,0 +1,37 @@ +<%@ include file="/common/taglibs.jsp"%> + +
+ + + + + + + +
+

+ ${sessionMap.title} +

+
+ +
+

+ +

+ + + + <%@ include file="/jsps/learning/mobile/message/topiceditform.jsp"%> +
+ +
+ +
+

 

+
+ +
+ + + + Index: lams_tool_forum/web/jsps/learning/mobile/message/bodyarea.jsp =================================================================== diff -u --- lams_tool_forum/web/jsps/learning/mobile/message/bodyarea.jsp (revision 0) +++ lams_tool_forum/web/jsps/learning/mobile/message/bodyarea.jsp (revision 456bef8020946d9bae40a5d5010e371407961d27) @@ -0,0 +1,42 @@ +<%@ include file="/includes/taglibs.jsp"%> + +
+ <%-- Does not user general tag because this field need keep compatible with FCKEditor's content --%> + +
+ + <%-- If limitChars == 0, then we don't want to limit the characters at all. --%> + + : + + + + + +
+ +
Index: lams_tool_forum/web/jsps/learning/mobile/message/msgattachment.jsp =================================================================== diff -u --- lams_tool_forum/web/jsps/learning/mobile/message/msgattachment.jsp (revision 0) +++ lams_tool_forum/web/jsps/learning/mobile/message/msgattachment.jsp (revision 456bef8020946d9bae40a5d5010e371407961d27) @@ -0,0 +1,27 @@ +<%@ include file="/common/taglibs.jsp" %> + + + + + + + + + + + +
: + + + + + + + + +
+
+ + + + Index: lams_tool_forum/web/jsps/learning/mobile/message/topiceditform.jsp =================================================================== diff -u --- lams_tool_forum/web/jsps/learning/mobile/message/topiceditform.jsp (revision 0) +++ lams_tool_forum/web/jsps/learning/mobile/message/topiceditform.jsp (revision 456bef8020946d9bae40a5d5010e371407961d27) @@ -0,0 +1,27 @@ +<%@ include file="/includes/taglibs.jsp"%> + +
+ +
+ + + + +
+ * +
+<%@include file="bodyarea.jsp"%> + +
+
+ + + + + + + +
+
Index: lams_tool_forum/web/jsps/learning/mobile/message/topicform.jsp =================================================================== diff -u --- lams_tool_forum/web/jsps/learning/mobile/message/topicform.jsp (revision 0) +++ lams_tool_forum/web/jsps/learning/mobile/message/topicform.jsp (revision 456bef8020946d9bae40a5d5010e371407961d27) @@ -0,0 +1,35 @@ +<%@ include file="/includes/taglibs.jsp"%> + + + + + + + + + +
+
+ + + + +
+
+ +
+ +
+ *
+ <%@include file="bodyarea.jsp"%> +
+ + + + + + + +
Index: lams_tool_forum/web/jsps/learning/mobile/message/topiclist.jsp =================================================================== diff -u --- lams_tool_forum/web/jsps/learning/mobile/message/topiclist.jsp (revision 0) +++ lams_tool_forum/web/jsps/learning/mobile/message/topiclist.jsp (revision 456bef8020946d9bae40a5d5010e371407961d27) @@ -0,0 +1,81 @@ +<%@ include file="/includes/taglibs.jsp"%> + + + \ No newline at end of file Index: lams_tool_forum/web/jsps/learning/mobile/message/topicreplyform.jsp =================================================================== diff -u --- lams_tool_forum/web/jsps/learning/mobile/message/topicreplyform.jsp (revision 0) +++ lams_tool_forum/web/jsps/learning/mobile/message/topicreplyform.jsp (revision 456bef8020946d9bae40a5d5010e371407961d27) @@ -0,0 +1,29 @@ +<%@ include file="/includes/taglibs.jsp"%> + +
+ +
+ + + + +
+ + * +
+ <%@include file="bodyarea.jsp"%> + +
+
+ + + + + + + +
+
Index: lams_tool_forum/web/jsps/learning/mobile/message/topicview.jsp =================================================================== diff -u --- lams_tool_forum/web/jsps/learning/mobile/message/topicview.jsp (revision 0) +++ lams_tool_forum/web/jsps/learning/mobile/message/topicview.jsp (revision 456bef8020946d9bae40a5d5010e371407961d27) @@ -0,0 +1,116 @@ +<%@ include file="/includes/taglibs.jsp"%> + + + + + + + + + + +
em;"> + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + +
+ + + + + + + + + ${author} + - + + +
+ + + + + + +
+ + +
+ +
+ + + +
+ + + + + + + + +
+
+ + + + <%@ include file="/jsps/learning/mobile/rating/ratingStarsDisabled.jsp"%> + + + <%@ include file="/jsps/learning/mobile/rating/ratingStars.jsp"%> + + + + + +
+ + + + + + + + + + + + +
+
+
+
+
+
+ Index: lams_tool_forum/web/jsps/learning/mobile/notebook.jsp =================================================================== diff -u --- lams_tool_forum/web/jsps/learning/mobile/notebook.jsp (revision 0) +++ lams_tool_forum/web/jsps/learning/mobile/notebook.jsp (revision 456bef8020946d9bae40a5d5010e371407961d27) @@ -0,0 +1,41 @@ +<%@ include file="/common/taglibs.jsp"%> + + + + + + + + + +
+

+ ${sessionMap.title} +

+ + <%@ include file="/common/messages.jsp"%> + +

+ +

+ + + +
+ + + +
+ +
+
Index: lams_tool_forum/web/jsps/learning/mobile/rating/ratingStars.jsp =================================================================== diff -u --- lams_tool_forum/web/jsps/learning/mobile/rating/ratingStars.jsp (revision 0) +++ lams_tool_forum/web/jsps/learning/mobile/rating/ratingStars.jsp (revision 456bef8020946d9bae40a5d5010e371407961d27) @@ -0,0 +1,21 @@ +<%@ include file="/common/taglibs.jsp"%> + + + +
+
+
+ + + + + + + + + ${msgDto.numberOfVotes} + + +
+
+
\ No newline at end of file Index: lams_tool_forum/web/jsps/learning/mobile/rating/ratingStarsDisabled.jsp =================================================================== diff -u --- lams_tool_forum/web/jsps/learning/mobile/rating/ratingStarsDisabled.jsp (revision 0) +++ lams_tool_forum/web/jsps/learning/mobile/rating/ratingStarsDisabled.jsp (revision 456bef8020946d9bae40a5d5010e371407961d27) @@ -0,0 +1,21 @@ +<%@ include file="/common/taglibs.jsp"%> + + + +
+
+
+ + + + + + + + + ${msgDto.numberOfVotes} + + +
+
+
\ No newline at end of file Index: lams_tool_forum/web/jsps/learning/mobile/reply.jsp =================================================================== diff -u --- lams_tool_forum/web/jsps/learning/mobile/reply.jsp (revision 0) +++ lams_tool_forum/web/jsps/learning/mobile/reply.jsp (revision 456bef8020946d9bae40a5d5010e371407961d27) @@ -0,0 +1,66 @@ +<%@ include file="/includes/taglibs.jsp"%> + +
+ + + + + + + + +
+

+ ${sessionMap.title} +

+
+ +
+

+ +

+ +

+

+ + + + + + + + + + + + + +
+ +
+ + + -
 
+
+ +

+ + +

+ +

+ + + <%@ include file="/jsps/learning/mobile/message/topicreplyform.jsp"%> + +
+
+ +
+

 

+
+ +
+ Index: lams_tool_forum/web/jsps/learning/mobile/runoffline.jsp =================================================================== diff -u --- lams_tool_forum/web/jsps/learning/mobile/runoffline.jsp (revision 0) +++ lams_tool_forum/web/jsps/learning/mobile/runoffline.jsp (revision 456bef8020946d9bae40a5d5010e371407961d27) @@ -0,0 +1,61 @@ +<%@ include file="/includes/taglibs.jsp"%> + + +
+ +

+ +

+ + + +

+ +

+
+ +
+ + + +
+
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + +
+
+ + Index: lams_tool_forum/web/jsps/learning/mobile/viewforum.jsp =================================================================== diff -u --- lams_tool_forum/web/jsps/learning/mobile/viewforum.jsp (revision 0) +++ lams_tool_forum/web/jsps/learning/mobile/viewforum.jsp (revision 456bef8020946d9bae40a5d5010e371407961d27) @@ -0,0 +1,160 @@ +<%@ include file="/common/taglibs.jsp"%> + + + + + + + + +
+ +
+

+ +

+
+ +
+
+ +
+ + +
+ + + +
+
+ + + +
+ + + + + + + + +
+
+ + +
+ + + + +
+
+ + +
+ + + +
+
+ + +
+ + + +
+
+ +
+ + <%@ include file="/common/messages.jsp"%> + + <%@ include file="/jsps/learning/mobile/message/topiclist.jsp"%> + +
+ + + + + + + + + + + + + + + + +
+ + +
+

+ ${sessionMap.reflectInstructions} +

+ + + +

+ +

+
+ +

+ +

+
+
+ + + + + + +
+
+ + + +
+ +
+
+ + + + + + + + + + + + + +
+
+
+ Index: lams_tool_forum/web/jsps/learning/mobile/viewtopic.jsp =================================================================== diff -u --- lams_tool_forum/web/jsps/learning/mobile/viewtopic.jsp (revision 0) +++ lams_tool_forum/web/jsps/learning/mobile/viewtopic.jsp (revision 456bef8020946d9bae40a5d5010e371407961d27) @@ -0,0 +1,229 @@ + + +<%@ include file="/common/taglibs.jsp"%> + +<%@ taglib uri="tags-tiles" prefix="tiles"%> + + + + + + + + + + + + + <fmt:message key="activity.title" /> + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + Back + +

+ ${sessionMap.title} +

+
+ +
+
+
+ +
+

+ +

+ +
+ + + + +
+ + + + + + +
+
+ +
+ + + + + +
+
+ +
+ + + + + +
+
+
+
+
+ + <%@ include file="message/topicview.jsp"%> + +
+ + + +
+
+ + +
+ + +
+ + + + + +