Index: lams_central/web/includes/javascript/main.js
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2e48a918c22150864aacb792f64f3103f61d3200
--- lams_central/web/includes/javascript/main.js (.../main.js) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/includes/javascript/main.js (.../main.js) (revision 2e48a918c22150864aacb792f64f3103f61d3200)
@@ -494,7 +494,7 @@
var orgID = $(this).data('orgID');
// load contents after opening the dialog
$('iframe', this).attr('src', LAMS_URL
- + 'gradebook/gradebookLearning.do?dispatch=courseLearner&organisationID=' + orgID);
+ + 'gradebook/gradebookLearning/courseLearner.do?organisationID=' + orgID);
}
}, true);
}
Index: lams_common/src/java/org/lamsfoundation/lams/integration/util/LoginRequestDispatcher.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2e48a918c22150864aacb792f64f3103f61d3200
--- lams_common/src/java/org/lamsfoundation/lams/integration/util/LoginRequestDispatcher.java (.../LoginRequestDispatcher.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_common/src/java/org/lamsfoundation/lams/integration/util/LoginRequestDispatcher.java (.../LoginRequestDispatcher.java) (revision 2e48a918c22150864aacb792f64f3103f61d3200)
@@ -96,7 +96,7 @@
private static final String URL_AUTHOR = "/home.do?method=author";
- private static final String URL_LEARNER = "/home.do?method=learner&lessonID=";
+ private static final String URL_LEARNER = "/home/learner.do?lessonID=";
private static final String URL_MONITOR = "/home.do?method=monitorLesson&lessonID=";
Index: lams_gradebook/web/gradebookCourseLearner.jsp
===================================================================
diff -u -r1704c05d7e844f968d3700990957ff05f3611ba5 -r2e48a918c22150864aacb792f64f3103f61d3200
--- lams_gradebook/web/gradebookCourseLearner.jsp (.../gradebookCourseLearner.jsp) (revision 1704c05d7e844f968d3700990957ff05f3611ba5)
+++ lams_gradebook/web/gradebookCourseLearner.jsp (.../gradebookCourseLearner.jsp) (revision 2e48a918c22150864aacb792f64f3103f61d3200)
@@ -10,7 +10,7 @@
Course Gradebook Learner
-
+
Index: lams_gradebook/web/gradebookCourseMonitor.jsp
===================================================================
diff -u -r1704c05d7e844f968d3700990957ff05f3611ba5 -r2e48a918c22150864aacb792f64f3103f61d3200
--- lams_gradebook/web/gradebookCourseMonitor.jsp (.../gradebookCourseMonitor.jsp) (revision 1704c05d7e844f968d3700990957ff05f3611ba5)
+++ lams_gradebook/web/gradebookCourseMonitor.jsp (.../gradebookCourseMonitor.jsp) (revision 2e48a918c22150864aacb792f64f3103f61d3200)
@@ -10,7 +10,7 @@
-
+
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressBuilder.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2e48a918c22150864aacb792f64f3103f61d3200
--- lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressBuilder.java (.../ProgressBuilder.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressBuilder.java (.../ProgressBuilder.java) (revision 2e48a918c22150864aacb792f64f3103f61d3200)
@@ -96,7 +96,7 @@
isFloating = false;
//if ( previewMode ) {
// setup the basic call to the learner screen, ready just to put the activity id on the end. Saves calculating it for every activity
- this.forceLearnerURL = "learner.do?method=forceMoveRedirect&lessonID=" + progress.getLesson().getLessonId()
+ this.forceLearnerURL = "learner/forceMoveRedirect.do?lessonID=" + progress.getLesson().getLessonId()
+ "&destActivityID=";
//}
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java
===================================================================
diff -u -r6f37a4eb8b2023d6e6dffceffa91ebdbf74c54f5 -r2e48a918c22150864aacb792f64f3103f61d3200
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java (.../ActivityMapping.java) (revision 6f37a4eb8b2023d6e6dffceffa91ebdbf74c54f5)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java (.../ActivityMapping.java) (revision 2e48a918c22150864aacb792f64f3103f61d3200)
@@ -164,7 +164,7 @@
String forward = null;
- String action = "/requestDisplay.do?url=" + encodedURL;
+ String action = "requestDisplay.do?url=" + encodedURL;
action = WebUtil.appendParameterToURL(action, AttributeNames.PARAM_LEARNER_PROGRESS_ID, progressId);
forward = actionToForward(action, null, false);
@@ -351,10 +351,10 @@
*/
public String getDisplayActivityAction(Long lessonID) {
if (lessonID != null) {
- return WebUtil.appendParameterToURL("/DisplayActivity.do", AttributeNames.PARAM_LESSON_ID,
+ return WebUtil.appendParameterToURL("DisplayActivity.do", AttributeNames.PARAM_LESSON_ID,
lessonID.toString());
} else {
- return "/DisplayActivity.do";
+ return "DisplayActivity.do";
}
}
}
\ No newline at end of file
Index: lams_tool_daco/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d -r2e48a918c22150864aacb792f64f3103f61d3200
--- lams_tool_daco/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision 13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d)
+++ lams_tool_daco/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision 2e48a918c22150864aacb792f64f3103f61d3200)
@@ -138,12 +138,12 @@
function restartLesson(){
if (confirm(restartLessonConfirmation)) {
- window.location.href = LEARNING_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+ window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
}
}
function viewNotebookEntries(){
- openPopUp(LEARNING_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+ openPopUp(LEARNING_URL + "notebook/viewAll.do?lessonID=" + lessonId,
"Notebook",
648,1152,
"no");
@@ -245,9 +245,8 @@
if ( lessonId != "" || toolSessionId != "" ) {
$.ajax({
- url : LEARNING_URL + 'learner.do',
+ url : LEARNING_URL + 'learner/getLessonDetails.do',
data : {
- 'method' : 'getLessonDetails',
'lessonID' : lessonId,
'toolSessionID' : toolSessionId,
},