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.60.2.7 -r1.60.2.8 --- lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java 3 Mar 2015 10:26:43 -0000 1.60.2.7 +++ lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java 14 Aug 2015 07:41:55 -0000 1.60.2.8 @@ -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.52.2.2 -r1.52.2.3 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java 30 Sep 2014 13:11:25 -0000 1.52.2.2 +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java 14 Aug 2015 07:41:54 -0000 1.52.2.3 @@ -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 { Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_learning/web/index.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_learning/web/main.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/main.jsp,v diff -u -r1.31.2.5 -r1.31.2.6 --- lams_learning/web/main.jsp 2 Jul 2015 12:32:54 -0000 1.31.2.5 +++ lams_learning/web/main.jsp 14 Aug 2015 07:41:54 -0000 1.31.2.6 @@ -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');} } }); @@ -140,7 +97,7 @@ - + @@ -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.5.2.1 --- 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:41:54 -0000 1.5.2.1 @@ -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; Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_learning/web/mobile/main.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_learning/web/mobile/progress.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_learning/web/mobile/common/progressOutput.jsp'. Fisheye: No comparison available. Pass `N' to diff?