Index: lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java
===================================================================
diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -rb4460e9343e9676b6fc81f5f3c27b2800d865b20
--- lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java (.../HomeAction.java) (revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa)
+++ lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java (.../HomeAction.java) (revision b4460e9343e9676b6fc81f5f3c27b2800d865b20)
@@ -76,18 +76,8 @@
import org.springframework.web.context.support.WebApplicationContextUtils;
/**
- * this is an action where all lams client environments launch. initial configuration of the individual environment
+ * This is an action where all lams client environments launch. initial configuration of the individual environment
* setting is done here.
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
*/
public class HomeAction extends DispatchAction {
Fisheye: Tag b4460e9343e9676b6fc81f5f3c27b2800d865b20 refers to a dead (removed) revision in file `lams_central/web/css/defaultHTML_learner_mobile.css'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag b4460e9343e9676b6fc81f5f3c27b2800d865b20 refers to a dead (removed) revision in file `lams_central/web/css/jquery.mobile.css'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_central/web/images/css/jquery-mobile/ajax-loader.gif
===================================================================
diff -u -r35a0e719d061c08b52e705135bb2f2126079ed21 -rb4460e9343e9676b6fc81f5f3c27b2800d865b20
Binary files differ
Index: lams_central/web/images/css/jquery-mobile/icons-18-black.png
===================================================================
diff -u -r8a26c775bdd80e345e2b1332a1c047ae346aa4ef -rb4460e9343e9676b6fc81f5f3c27b2800d865b20
Binary files differ
Index: lams_central/web/images/css/jquery-mobile/icons-18-white.png
===================================================================
diff -u -r8a26c775bdd80e345e2b1332a1c047ae346aa4ef -rb4460e9343e9676b6fc81f5f3c27b2800d865b20
Binary files differ
Index: lams_central/web/images/css/jquery-mobile/icons-36-black.png
===================================================================
diff -u -r8a26c775bdd80e345e2b1332a1c047ae346aa4ef -rb4460e9343e9676b6fc81f5f3c27b2800d865b20
Binary files differ
Index: lams_central/web/images/css/jquery-mobile/icons-36-white.png
===================================================================
diff -u -r8a26c775bdd80e345e2b1332a1c047ae346aa4ef -rb4460e9343e9676b6fc81f5f3c27b2800d865b20
Binary files differ
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
===================================================================
diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -rb4460e9343e9676b6fc81f5f3c27b2800d865b20
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java (.../LearnerAction.java) (revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java (.../LearnerAction.java) (revision b4460e9343e9676b6fc81f5f3c27b2800d865b20)
@@ -73,13 +73,6 @@
* @author Jacky Fang
* @since 3/03/2005
* @version 1.1
- *
- *
- *
- *
- *
- *
- *
*/
public class LearnerAction extends LamsDispatchAction {
// ---------------------------------------------------------------------
@@ -227,37 +220,6 @@
return null;
}
- /**
- * Gets the same url as getLearnerActivityURL() but forwards directly to the url.
- *
- * @param mapping
- * An ActionMapping class that will be used by the Action class to tell the ActionServlet where to send
- * the end-user.
- * @param form
- * The ActionForm class that will contain any data submitted by the end-user via a form.
- * @param request
- * A standard Servlet HttpServletRequest class.
- * @param response
- * A standard Servlet HttpServletResponse class.
- * @return An ActionForward class that will be returned to the ActionServlet indicating where the user is to go
- * next.
- * @throws IOException
- * @throws ServletException
- */
- public ActionForward displayProgress(ActionMapping mapping, ActionForm form, HttpServletRequest request,
- HttpServletResponse response) throws IOException, ServletException {
- Integer learnerId = LearningWebUtil.getUserId();
- Long lessonId = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
-
- ICoreLearnerService learnerService = LearnerServiceProxy.getLearnerService(getServlet().getServletContext());
- Object[] ret = learnerService.getStructuredActivityURLs(learnerId, lessonId);
- ;
- request.setAttribute("progressList", ret[0]);
- request.setAttribute("currentActivityID", ret[1]);
-
- return mapping.findForward("displayProgress");
- }
-
public ActionForward getPresenceChatActiveUserCount(ActionMapping mapping, ActionForm form,
HttpServletRequest request, HttpServletResponse response) throws IOException {
Long lessonId = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
Index: lams_learning/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r04ef51d89657c4ec7e5cf0eeb8d6ef2eb9f80797 -rb4460e9343e9676b6fc81f5f3c27b2800d865b20
--- lams_learning/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision 04ef51d89657c4ec7e5cf0eeb8d6ef2eb9f80797)
+++ lams_learning/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision b4460e9343e9676b6fc81f5f3c27b2800d865b20)
@@ -188,11 +188,6 @@
redirect="false"
/>
-
-
-
-
-
-
-
@@ -83,9 +77,8 @@
-
+
-
Fisheye: Tag b4460e9343e9676b6fc81f5f3c27b2800d865b20 refers to a dead (removed) revision in file `lams_learning/web/WEB-INF/urlrewrite.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_learning/web/WEB-INF/web.xml
===================================================================
diff -u -r5e63656a12c02f7476564e278b43ff4ce86ac930 -rb4460e9343e9676b6fc81f5f3c27b2800d865b20
--- lams_learning/web/WEB-INF/web.xml (.../web.xml) (revision 5e63656a12c02f7476564e278b43ff4ce86ac930)
+++ lams_learning/web/WEB-INF/web.xml (.../web.xml) (revision b4460e9343e9676b6fc81f5f3c27b2800d865b20)
@@ -33,11 +33,6 @@
- UrlRewriteFilter
- org.tuckey.web.filters.urlrewrite.UrlRewriteFilter
-
-
-
HibernateFilter
org.springframework.orm.hibernate4.support.OpenSessionInViewFilter
@@ -65,18 +60,6 @@
- UrlRewriteFilter
- /layout/supportMobileVersionLayout.jsp
- FORWARD
-
-
-
- UrlRewriteFilter
- /main.jsp
- FORWARD
-
-
-
HibernateFilter
/*
Fisheye: Tag b4460e9343e9676b6fc81f5f3c27b2800d865b20 refers to a dead (removed) revision in file `lams_learning/web/index.jsp'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag b4460e9343e9676b6fc81f5f3c27b2800d865b20 refers to a dead (removed) revision in file `lams_learning/web/layout/mobileLayout.jsp'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag b4460e9343e9676b6fc81f5f3c27b2800d865b20 refers to a dead (removed) revision in file `lams_learning/web/layout/supportMobileVersionLayout.jsp'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag b4460e9343e9676b6fc81f5f3c27b2800d865b20 refers to a dead (removed) revision in file `lams_learning/web/mobile/common/progressOutput.jsp'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag b4460e9343e9676b6fc81f5f3c27b2800d865b20 refers to a dead (removed) revision in file `lams_learning/web/mobile/lessonComplete.jsp'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag b4460e9343e9676b6fc81f5f3c27b2800d865b20 refers to a dead (removed) revision in file `lams_learning/web/mobile/main.jsp'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag b4460e9343e9676b6fc81f5f3c27b2800d865b20 refers to a dead (removed) revision in file `lams_learning/web/mobile/progress.jsp'.
Fisheye: No comparison available. Pass `N' to diff?