Index: lams_central/web/css/defaultHTML_learner_mobile.css =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/css/defaultHTML_learner_mobile.css,v diff -u -r1.3 -r1.4 --- lams_central/web/css/defaultHTML_learner_mobile.css 29 Feb 2012 21:26:37 -0000 1.3 +++ lams_central/web/css/defaultHTML_learner_mobile.css 10 Apr 2013 15:26:45 -0000 1.4 @@ -6,9 +6,9 @@ body.large-font {font-size: 16px;} h2 {/*color:#47bc23; */ - font-size:14px; + font-size:17px; padding-top:10px; - margin-bottom:5px; } + margin-bottom:15px; } span.h2font {color:#47bc23; font-size:14px; } @@ -32,6 +32,11 @@ margin-bottom:8px; } +p { + margin-right: 30px; + margin-top:10px; +} + .regular-li { font-size: 14px; font-weight: normal; } /**********************layout of the table with the alternate color for the table heading cell *********************/ @@ -50,9 +55,8 @@ } table.alternative-color td { - padding:5px; - padding-left: 2px; - font-size: 11px; + padding:8px 5px; + font-size: 12px; border-bottom: 1px solid #efefef; vertical-align: middle; background:url('../images/css/greyfade_bg.jpg') repeat-x 3px 0px Index: lams_tool_larsrc/web/WEB-INF/urlrewrite.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/WEB-INF/urlrewrite.xml,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_larsrc/web/WEB-INF/urlrewrite.xml 10 Apr 2013 15:26:42 -0000 1.1 @@ -0,0 +1,40 @@ + + + + + + + + + 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|bb\\d+|meego).+mobile|avantgo|bada\\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|ipad|iris|kindle|lge |maemo|midp|mmp|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\\/|plucker|pocket|psp|series(4|6)0|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|\\-[a-w])|libw|lynx|m1\\-w|m3ga|m50\\/|ma(te|ui|xo)|mc(01|21|ca)|m\\-cr|me(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|yas\\-|your|zeto|zte\\-).*?i + .*chrome.*?i + ^/(.*)learning/([^/]*\.jsp)$ + /$1learning/mobile/$2 + + + + + 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|bb\\d+|meego).+mobile|avantgo|bada\\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|ipad|iris|kindle|lge |maemo|midp|mmp|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\\/|plucker|pocket|psp|series(4|6)0|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|\\-[a-w])|libw|lynx|m1\\-w|m3ga|m50\\/|ma(te|ui|xo)|mc(01|21|ca)|m\\-cr|me(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|yas\\-|your|zeto|zte\\-).*?i + .*chrome.*?i + ^/(.*)itemreview/([^/]*\.jsp)$ + /$1itemreview/mobile/$2 + + + + Index: lams_tool_larsrc/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/WEB-INF/web.xml,v diff -u -r1.23 -r1.24 --- lams_tool_larsrc/web/WEB-INF/web.xml 30 Jul 2012 18:50:06 -0000 1.23 +++ lams_tool_larsrc/web/WEB-INF/web.xml 10 Apr 2013 15:26:42 -0000 1.24 @@ -39,46 +39,56 @@ - - hibernateFilter - - org.springframework.orm.hibernate3.support.OpenSessionInViewFilter - - - sessionFactoryBeanName - coreSessionFactory - - - - - SystemSessionFilter - - org.lamsfoundation.lams.web.session.SystemSessionFilter - - - - LocaleFilter - - org.lamsfoundation.lams.web.filter.LocaleFilter - - - encoding - UTF-8 - - + + UrlRewriteFilter + org.tuckey.web.filters.urlrewrite.UrlRewriteFilter + + + hibernateFilter + + org.springframework.orm.hibernate3.support.OpenSessionInViewFilter + + + sessionFactoryBeanName + coreSessionFactory + + + + + SystemSessionFilter + + org.lamsfoundation.lams.web.session.SystemSessionFilter + + + + LocaleFilter + + org.lamsfoundation.lams.web.filter.LocaleFilter + + + encoding + UTF-8 + + - - hibernateFilter - /* - - - SystemSessionFilter - /* - - - LocaleFilter - /* - + + UrlRewriteFilter + /* + REQUEST + FORWARD + + + hibernateFilter + /* + + + SystemSessionFilter + /* + + + LocaleFilter + /* + + + + + + Index: lams_tool_larsrc/web/pages/learning/mobile/learning.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/mobile/learning.jsp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_larsrc/web/pages/learning/mobile/learning.jsp 10 Apr 2013 15:26:41 -0000 1.1 @@ -0,0 +1,255 @@ + + +<%-- If you change this file, remember to update the copy made for CNG-36 --%> + +<%@ include file="/common/taglibs.jsp"%> + + + <fmt:message key="label.learning.title" /> + <%@ include file="/common/mobileheader.jsp"%> + + <%-- param has higher level for request attribute --%> + + + + + + + + + + + ?sessionMapID=${sessionMapID}&mode=${mode} + ?sessionMapID=${sessionMapID}&mode=${mode} + + + + +
+ +
+

+ ${resource.title} +

+
+ +
+ +

+ ${resource.instructions} +

+ + +
+ + + + + + + + +
+
+ + <%@ include file="/common/messages.jsp"%> + + + + + + + + + + + + + + + + + + +
+ + + +
+ + ${item.title} + + + [${item.createBy.loginName}] + + + + + + + + - + + +
+ ${resource.miniViewNumberStr} +
+ + + +

+ + + +

+
+ + + + +

+ +

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

+ ${sessionMap.reflectInstructions} +

+ + + +

+ + +

+
+ +

+ +

+
+
+ + + + + + +
+
+ +
+ +
+ + + + + + + + + + + + + +
+ +
+ +
Index: lams_tool_larsrc/web/pages/learning/mobile/notebook.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/mobile/notebook.jsp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_larsrc/web/pages/learning/mobile/notebook.jsp 10 Apr 2013 15:26:41 -0000 1.1 @@ -0,0 +1,70 @@ +<%@ include file="/common/taglibs.jsp"%> + + + + + + + + <fmt:message key="label.learning.title" /> + + <%@ include file="/common/mobileheader.jsp"%> + + + + +
+ + + + + +
+

+ ${sessionMap.title} +

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

+ +

+ + + +
+ + + +
+ +
+ +
Index: lams_tool_larsrc/web/pages/learning/mobile/runoffline.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/mobile/Attic/runoffline.jsp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_larsrc/web/pages/learning/mobile/runoffline.jsp 10 Apr 2013 15:26:41 -0000 1.1 @@ -0,0 +1,95 @@ + + +<%@include file="/common/taglibs.jsp"%> + + + + <%@ include file="/common/mobileheader.jsp"%> + + + + + +
+ +
+

+ ${sessionMap.title} +

+
+ +
+ +

+ +

+ + +
+

+ ${sessionMap.reflectInstructions} +

+ + + +

+ + +

+
+ +

+ +

+
+
+ + + + +
+
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +
Index: lams_tool_larsrc/web/pages/learning/mobile/start.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/mobile/start.jsp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_larsrc/web/pages/learning/mobile/start.jsp 10 Apr 2013 15:26:41 -0000 1.1 @@ -0,0 +1,21 @@ + + +<%@ include file="/common/taglibs.jsp"%> + + + + + + + + + + + + + Index: lams_tool_larsrc/web/pages/learning/mobile/success.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/mobile/success.jsp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_larsrc/web/pages/learning/mobile/success.jsp 10 Apr 2013 15:26:41 -0000 1.1 @@ -0,0 +1,25 @@ + + +<%@ include file="/common/taglibs.jsp"%> + + + + + <%@ include file="/common/mobileheader.jsp"%> + + + +
+ + Add URL success, click here to return. + + + Add File success, click here to return. + +
+ +
\ No newline at end of file