Index: lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java,v diff -u -r1.67 -r1.68 --- lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java 3 Mar 2015 10:19:44 -0000 1.67 +++ lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java 14 Aug 2015 07:34:57 -0000 1.68 @@ -232,7 +232,7 @@ + serverURLContextPath; serverURLContextPath += serverURLContextPath.endsWith("/") ? "" : "/"; getServlet().getServletContext().getContext(serverURLContextPath + "learning") - .getRequestDispatcher("/main.jsp").forward(req, res); + .getRequestDispatcher("/index.jsp").forward(req, res); return null; } catch (Exception e) { Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java,v diff -u -r1.55 -r1.56 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java 26 Sep 2014 11:33:03 -0000 1.55 +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java 14 Aug 2015 07:34:56 -0000 1.56 @@ -86,7 +86,7 @@ * * @struts:action path="/learner" parameter="method" validate="false" * @struts:action-forward name="displayActivity" path="/DisplayActivity.do" - * @struts:action-forward name="displayProgress" path="/progress.jsp" + * @struts:action-forward name="displayProgress" path="/mobile/progress.jsp" * @struts:action-forward name="message" path=".message" */ public class LearnerAction extends LamsDispatchAction { Index: lams_learning/web/index.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/Attic/index.jsp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_learning/web/index.jsp 14 Aug 2015 07:34:56 -0000 1.1 @@ -0,0 +1,39 @@ +<%-- +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 +--%> + +<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%> +<%@ taglib uri="tags-core" prefix="c"%> +<% +String userAgent = request.getHeader("User-Agent").toLowerCase(); +boolean isTouchInterface = (userAgent.matches("(?i).*(iphone|ipod|ipad).*")); +%> +<%=isTouchInterface%> + + + + + + <%@ include file="mobile/main.jsp" %> + + + <%@ include file="main.jsp" %> + + \ No newline at end of file Index: lams_learning/web/main.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/main.jsp,v diff -u -r1.37 -r1.38 --- lams_learning/web/main.jsp 2 Jul 2015 12:27:52 -0000 1.37 +++ lams_learning/web/main.jsp 14 Aug 2015 07:34:56 -0000 1.38 @@ -1,36 +1,6 @@ -<%-- -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 ---%> - -<%@ 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"%> -<% -String userAgent = request.getHeader("User-Agent").toLowerCase(); -boolean isTouchInterface = (userAgent.matches("(?i).*(iphone|ipod|ipad).*")); -%> -<%=isTouchInterface%> - - @@ -73,7 +43,6 @@ isHorizontalBar = false, hasContentFrame = true, hasDialog = false, - isTouchInterface = ${isTouchInterface}, bars = { 'learnerMainBar' : { @@ -105,19 +74,7 @@ togglerTip_open : '', togglerTip_closed : '', - onopen_start : function() {$('#controlFrame').css('visibility','visible');}, - onopen_end : function() { - //expand contentFrame width altogether with content-frame-container - if (isTouchInterface) { - $("#contentFrame").width($("#content-frame-container").width()); - }; - }, - onclose_end : function() { - //shrink contentFrame width altogether with content-frame-container - if (isTouchInterface) { - $("#contentFrame").width($("#content-frame-container").width()); - }; - }, + onopen_start : function() {$('#controlFrame').css('visibility','visible');} } }); @@ -204,22 +161,9 @@ <%@ include file="presenceChat.jsp"%> - - -
- -
-
- - - - -
- + +
- - -
+ \ No newline at end of file Index: lams_learning/web/css/main.css =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/css/main.css,v diff -u -r1.5 -r1.6 --- lams_learning/web/css/main.css 17 Jan 2014 22:37:27 -0000 1.5 +++ lams_learning/web/css/main.css 14 Aug 2015 07:34:56 -0000 1.6 @@ -29,11 +29,6 @@ margin-left: 160px; } -#content-frame-container { - overflow: auto !important; - -webkit-overflow-scrolling: touch !important; -} - table#logoTable { height: 20px; table-layout: fixed; Index: lams_learning/web/mobile/main.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/mobile/main.jsp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_learning/web/mobile/main.jsp 14 Aug 2015 07:34:56 -0000 1.1 @@ -0,0 +1,52 @@ +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-fmt" prefix="fmt" %> +<%@ taglib uri="tags-lams" prefix="lams" %> + + + + + css/main.css" rel="stylesheet" type="text/css" /> + + + + + + + + <fmt:message key="learner.title"/> + + + + +
+       + learner.do?method=displayProgress&lessonID=&keepThis=true&TB_iframe=true&height=300&width=400" title=" - " class="thickbox">    + '"/>    + exportWaitingPage.jsp?mode=learner&lessonID=&hideClose=true&keepThis=true&TB_iframe=true&height=300&width=400" title="" class="thickbox">    + notebook.do?method=viewAll&lessonID=')">    + +
+ + + <%@ include file="../presenceChat.jsp" %> + + + + + +
\ No newline at end of file Index: lams_learning/web/mobile/progress.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/mobile/progress.jsp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_learning/web/mobile/progress.jsp 14 Aug 2015 07:34:56 -0000 1.1 @@ -0,0 +1,64 @@ +<%-- +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 +--%> + +<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %> +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-fmt" prefix="fmt" %> +<%@ taglib uri="tags-lams" prefix="lams" %> + + + + + + <fmt:message key="learner.title"/> + + + + + + + +
    + + +
     
    +
    + + + +
+
+
+ + +
+ + + Index: lams_learning/web/mobile/common/progressOutput.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/mobile/common/progressOutput.jsp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_learning/web/mobile/common/progressOutput.jsp 14 Aug 2015 07:34:56 -0000 1.1 @@ -0,0 +1,91 @@ +<% +/**************************************************************** + * 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.0 + * 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 + * **************************************************************** + */ + + /** + * Progress Output + * Author: Fiona Malikoff + * Description: Outputs the Activity details on the jsp progress page. Recursive tag + * + */ + + /** Need to add current ! */ + + %> +<%@ taglib uri="tags-core" prefix="c" %> +<%@ taglib uri="tags-lams" prefix="lams" %> + + +
  • + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${includeActivity.title} + + + + + +
      + + + + +
    +
    +
    + +
  • +