Index: lams_tool_vote/build.xml =================================================================== diff -u -r618abc7cca98f08ef288878ab371a3693492d835 -r15dba48903f459fd983b525047ce21373d5a44ec --- lams_tool_vote/build.xml (.../build.xml) (revision 618abc7cca98f08ef288878ab371a3693492d835) +++ lams_tool_vote/build.xml (.../build.xml) (revision 15dba48903f459fd983b525047ce21373d5a44ec) @@ -257,7 +257,7 @@ - + Index: lams_tool_vote/web/WEB-INF/urlrewrite.xml =================================================================== diff -u --- lams_tool_vote/web/WEB-INF/urlrewrite.xml (revision 0) +++ lams_tool_vote/web/WEB-INF/urlrewrite.xml (revision 15dba48903f459fd983b525047ce21373d5a44ec) @@ -0,0 +1,87 @@ + + + + + + + + + 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)|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 + ^/(.*)learning/([^/]*\.jsp)$ + /$1learning/mobile/$2 + + + + + + + Index: lams_tool_vote/web/WEB-INF/web.xml =================================================================== diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -r15dba48903f459fd983b525047ce21373d5a44ec --- lams_tool_vote/web/WEB-INF/web.xml (.../web.xml) (revision 8179037dc958585c054547eb7de9be14c6aed233) +++ lams_tool_vote/web/WEB-INF/web.xml (.../web.xml) (revision 15dba48903f459fd983b525047ce21373d5a44ec) @@ -44,6 +44,30 @@ + UrlRewriteFilter + org.tuckey.web.filters.urlrewrite.UrlRewriteFilter + + confReloadCheckInterval + 3 + + + logLevel + DEBUG + + + confPath + /WEB-INF/urlrewrite.xml + + + + + UrlRewriteFilter + /* + REQUEST + FORWARD + + + SystemSessionFilter org.lamsfoundation.lams.web.session.SystemSessionFilter Index: lams_tool_vote/web/learning/mobile/AllNominations.jsp =================================================================== diff -u --- lams_tool_vote/web/learning/mobile/AllNominations.jsp (revision 0) +++ lams_tool_vote/web/learning/mobile/AllNominations.jsp (revision 15dba48903f459fd983b525047ce21373d5a44ec) @@ -0,0 +1,293 @@ +<%-- +Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) +License Information: http://lamsfoundation.org/licensing/lams/2.0/ + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + USA + + http://www.gnu.org/licenses/gpl.txt +--%> + + + +<%@ include file="/common/taglibs.jsp"%> + + + + + + + + + + + + <fmt:message key="activity.title" /> + + + + + + + + + + + +
+ +
+

+ +

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

+ +

+ + +
    + + + + + + + + + + + + + + + +
    + + + +
    + + + + + + + + + + + + + + + + + + monitoring.do?method=getVoteNomination&questionUid=${currentQuestionUid.value}&sessionUid=${currentSessionUid.value} + + + + + + + + + + + + + + + + + + + + + + + + +  ( + ) + + +
    +
+ +
+
+ + + + + + + + + + + + +
+ + + + + +
+ +
+
+
+
 
+
+ + + + + + + + + + + + +
+ + +
+ +
+
+ +
+ +
+ + + + +

+ +

+ +

+ +

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

 

+
+
+ +
+ +
+ + + + + + + Index: lams_tool_vote/web/learning/mobile/AnswersContent.jsp =================================================================== diff -u --- lams_tool_vote/web/learning/mobile/AnswersContent.jsp (revision 0) +++ lams_tool_vote/web/learning/mobile/AnswersContent.jsp (revision 15dba48903f459fd983b525047ce21373d5a44ec) @@ -0,0 +1,214 @@ +<%-- +Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) +License Information: http://lamsfoundation.org/licensing/lams/2.0/ + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + USA + + http://www.gnu.org/licenses/gpl.txt +--%> + + + +<%@ include file="/common/taglibs.jsp"%> + + + + + + + + + + + + <fmt:message key="activity.title" /> + + + + + + + + + +
+ +
+

+ +

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

+ +

+ + +

 

+

+ + + + + +

+
+ +
    + + + + + + + + + + +
    + + + +
    +
+ + + : + + + + + +
+ +
+ +
+ +
+
+ +
+

 

+
+ +
+ +
Index: lams_tool_vote/web/learning/mobile/ExitLearning.jsp =================================================================== diff -u --- lams_tool_vote/web/learning/mobile/ExitLearning.jsp (revision 0) +++ lams_tool_vote/web/learning/mobile/ExitLearning.jsp (revision 15dba48903f459fd983b525047ce21373d5a44ec) @@ -0,0 +1,136 @@ +<%-- +Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) +License Information: http://lamsfoundation.org/licensing/lams/2.0/ + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + USA + + http://www.gnu.org/licenses/gpl.txt +--%> + + + +<%@ include file="/common/taglibs.jsp"%> + + + + + + + + + + + + <fmt:message key="activity.title" /> + + + + + + + + + + +
+ +
+

+ +

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

+ +

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

 

+
+
+ +
+ +
Index: lams_tool_vote/web/learning/mobile/IndividualLearnerResults.jsp =================================================================== diff -u --- lams_tool_vote/web/learning/mobile/IndividualLearnerResults.jsp (revision 0) +++ lams_tool_vote/web/learning/mobile/IndividualLearnerResults.jsp (revision 15dba48903f459fd983b525047ce21373d5a44ec) @@ -0,0 +1,150 @@ +<%-- +Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) +License Information: http://lamsfoundation.org/licensing/lams/2.0/ + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + USA + + http://www.gnu.org/licenses/gpl.txt +--%> + + + +<%@ include file="/common/taglibs.jsp"%> + + + + + + + + + + + + <fmt:message key="activity.title" /> + + + + + + + + + +
+ +
+

+ +

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

+ + +

+ +
    + +
  • + +
  • + + +
    + + +
  • + +
  • +
    +
+ +
+ +
+
+
+ +
+ + + + + + + + + + + + + + + + + + + +
+ +
+ +
Index: lams_tool_vote/web/learning/mobile/Notebook.jsp =================================================================== diff -u --- lams_tool_vote/web/learning/mobile/Notebook.jsp (revision 0) +++ lams_tool_vote/web/learning/mobile/Notebook.jsp (revision 15dba48903f459fd983b525047ce21373d5a44ec) @@ -0,0 +1,76 @@ +<%-- +Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) +License Information: http://lamsfoundation.org/licensing/lams/2.0/ + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + USA + + http://www.gnu.org/licenses/gpl.txt +--%> + + + +<%@ include file="/common/taglibs.jsp"%> + + + + + + + + + + + + <fmt:message key="activity.title" /> + + + + + + + + + + + +
+ + + +
+ +aaaaaaaaaaaaaaaaaaaaaa +
+ + + +
+ +
+ + + + + + + + Index: lams_tool_vote/web/learning/mobile/RevisitedAllNominations.jsp =================================================================== diff -u --- lams_tool_vote/web/learning/mobile/RevisitedAllNominations.jsp (revision 0) +++ lams_tool_vote/web/learning/mobile/RevisitedAllNominations.jsp (revision 15dba48903f459fd983b525047ce21373d5a44ec) @@ -0,0 +1,128 @@ +<%-- +Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) +License Information: http://lamsfoundation.org/licensing/lams/2.0/ + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + USA + + http://www.gnu.org/licenses/gpl.txt +--%> + + + +<%@ include file="/common/taglibs.jsp"%> + + + + + + + + + + + + <fmt:message key="activity.title" /> + + + + + + + + + + + +
+ +
+

+ +

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

+ +

+ + + + +
+ + + +
+ +
+ +
+
+ +
+ +
+ + + + + +
+ +
+ +
Index: lams_tool_vote/web/learning/mobile/RevisitedDisplay.jsp =================================================================== diff -u --- lams_tool_vote/web/learning/mobile/RevisitedDisplay.jsp (revision 0) +++ lams_tool_vote/web/learning/mobile/RevisitedDisplay.jsp (revision 15dba48903f459fd983b525047ce21373d5a44ec) @@ -0,0 +1,161 @@ +<%-- +Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) +License Information: http://lamsfoundation.org/licensing/lams/2.0/ + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + USA + + http://www.gnu.org/licenses/gpl.txt +--%> + +<%@ include file="/common/taglibs.jsp"%> + +

+ +

+ + +
    + + + + + + + + + + + + + + + +
    + + + +
    + + + + + + + + + + + + + + + + + + + monitoring.do?method=getVoteNomination&questionUid=${currentQuestionUid.value}&sessionUid=${currentSessionUid.value} + + + + + + + + + + + + + + + + + + + + + + +  ( + ) + + +
    +
+ +
+
+ + + + + + images/piechart.gif" width=30 + title="" + onclick="javascript:launchInstructionsPopup('')" + height="30" border="0" style="cursor: pointer;"> + + + + + + images/columnchart.gif" width=30 + title="" + onclick="javascript:launchInstructionsPopup('')" + height=30 border="0" style="cursor: pointer;"> +
+ + + + +
+ +
+
+
 
+
+ + + + + + + + + + + + +
+ +
+
+
+ +
+
Index: lams_tool_vote/web/learning/mobile/RevisitedNoDisplay.jsp =================================================================== diff -u --- lams_tool_vote/web/learning/mobile/RevisitedNoDisplay.jsp (revision 0) +++ lams_tool_vote/web/learning/mobile/RevisitedNoDisplay.jsp (revision 15dba48903f459fd983b525047ce21373d5a44ec) @@ -0,0 +1,46 @@ +<%-- +Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) +License Information: http://lamsfoundation.org/licensing/lams/2.0/ + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + USA + + http://www.gnu.org/licenses/gpl.txt +--%> + +<%@ include file="/common/taglibs.jsp"%> + + + + + +

+ +
+ +

+ +
+
+ + + +
+ +
+
+
+ +
Index: lams_tool_vote/web/learning/mobile/RunOffline.jsp =================================================================== diff -u --- lams_tool_vote/web/learning/mobile/RunOffline.jsp (revision 0) +++ lams_tool_vote/web/learning/mobile/RunOffline.jsp (revision 15dba48903f459fd983b525047ce21373d5a44ec) @@ -0,0 +1,114 @@ +<%-- +Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) +License Information: http://lamsfoundation.org/licensing/lams/2.0/ + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + USA + + http://www.gnu.org/licenses/gpl.txt +--%> + + + +<%@ include file="/common/taglibs.jsp"%> + + + + + + + + + + + + <fmt:message key="activity.title" /> + + + + + + + + + + + +
+ +
+

+ +

+
+ + + + + + +
+ + +

+ +

+
+ +
+ + + +
+
+
+
+
+ +
+ + + + + + + + + + + +
+ +
+ +
+ + + + + + + + Index: lams_tool_vote/web/learning/mobile/defineLater.jsp =================================================================== diff -u --- lams_tool_vote/web/learning/mobile/defineLater.jsp (revision 0) +++ lams_tool_vote/web/learning/mobile/defineLater.jsp (revision 15dba48903f459fd983b525047ce21373d5a44ec) @@ -0,0 +1,73 @@ +<%-- +Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) +License Information: http://lamsfoundation.org/licensing/lams/2.0/ + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + USA + + http://www.gnu.org/licenses/gpl.txt +--%> + + + +<%@ include file="/common/taglibs.jsp"%> + + + + + + + + + + + + <fmt:message key="activity.title" /> + + + + + + + + + +
+ +
+

+ +

+
+ +
+ +
+ +
+

 

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