Index: lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java
===================================================================
diff -u -rf00e04282d3f3378c80a948bc560c59dc3b15f47 -r715b8aae1297fe15f7a0a65c52e39b50cae4c157
--- lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java (.../HomeAction.java) (revision f00e04282d3f3378c80a948bc560c59dc3b15f47)
+++ lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java (.../HomeAction.java) (revision 715b8aae1297fe15f7a0a65c52e39b50cae4c157)
@@ -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
===================================================================
diff -u -r1d2ff22c947ab0d5646bb02b8189ca668020bdbc -r715b8aae1297fe15f7a0a65c52e39b50cae4c157
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java (.../LearnerAction.java) (revision 1d2ff22c947ab0d5646bb02b8189ca668020bdbc)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java (.../LearnerAction.java) (revision 715b8aae1297fe15f7a0a65c52e39b50cae4c157)
@@ -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/css/main.css
===================================================================
diff -u -rc135649b64e98c9233da20bdcfb7689598116314 -r715b8aae1297fe15f7a0a65c52e39b50cae4c157
--- lams_learning/web/css/main.css (.../main.css) (revision c135649b64e98c9233da20bdcfb7689598116314)
+++ lams_learning/web/css/main.css (.../main.css) (revision 715b8aae1297fe15f7a0a65c52e39b50cae4c157)
@@ -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/index.jsp
===================================================================
diff -u
--- lams_learning/web/index.jsp (revision 0)
+++ lams_learning/web/index.jsp (revision 715b8aae1297fe15f7a0a65c52e39b50cae4c157)
@@ -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
===================================================================
diff -u -r8490f1d8687a4f783bddab8c5ddfbdef9298842d -r715b8aae1297fe15f7a0a65c52e39b50cae4c157
--- lams_learning/web/main.jsp (.../main.jsp) (revision 8490f1d8687a4f783bddab8c5ddfbdef9298842d)
+++ lams_learning/web/main.jsp (.../main.jsp) (revision 715b8aae1297fe15f7a0a65c52e39b50cae4c157)
@@ -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/mobile/common/progressOutput.jsp
===================================================================
diff -u
--- lams_learning/web/mobile/common/progressOutput.jsp (revision 0)
+++ lams_learning/web/mobile/common/progressOutput.jsp (revision 715b8aae1297fe15f7a0a65c52e39b50cae4c157)
@@ -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" %>
+
+
