Index: lams_central/web/WEB-INF/web.xml
===================================================================
diff -u -rbf7188dd95898df53f786a38b116214d005c8fb2 -r9ec094b99f07058e55715478a99c77423acda2f9
--- lams_central/web/WEB-INF/web.xml (.../web.xml) (revision bf7188dd95898df53f786a38b116214d005c8fb2)
+++ lams_central/web/WEB-INF/web.xml (.../web.xml) (revision 9ec094b99f07058e55715478a99c77423acda2f9)
@@ -649,6 +649,7 @@
/includes/javascript/*
/includes/font-awesome/*
/ckeditor/*
+ /loadVars.jsp
/favicon.ico
GET
POST
Index: lams_central/web/includes/javascript/learning-design-treeview.js
===================================================================
diff -u -r0549136389d906a0aa8837ffc15f8d57bc45d5b6 -r9ec094b99f07058e55715478a99c77423acda2f9
--- lams_central/web/includes/javascript/learning-design-treeview.js (.../learning-design-treeview.js) (revision 0549136389d906a0aa8837ffc15f8d57bc45d5b6)
+++ lams_central/web/includes/javascript/learning-design-treeview.js (.../learning-design-treeview.js) (revision 9ec094b99f07058e55715478a99c77423acda2f9)
@@ -10,7 +10,7 @@
ldTree : null,
// can be i18n
LABEL_RUN_SEQUENCES_FOLDER : 'Run sequences',
- FOLDER_CONTENTS_FETCH_URL = LAMS_URL + 'home/getFolderContents.do',
+ FOLDER_CONTENTS_FETCH_URL : 'home/getFolderContents.do',
/**
@@ -58,7 +58,7 @@
result = [];
$.ajax({
- url : FOLDER_CONTENTS_FETCH_URL,
+ url : LAMS_URL + this.FOLDER_CONTENTS_FETCH_URL,
data : {
'folderID' : folderID,
'allowInvalidDesigns' : allowInvalidDesigns
Index: lams_central/web/includes/javascript/openUrls.js
===================================================================
diff -u -r92525f17be9db4e57a8551ff92d004f319fb4b73 -r9ec094b99f07058e55715478a99c77423acda2f9
--- lams_central/web/includes/javascript/openUrls.js (.../openUrls.js) (revision 92525f17be9db4e57a8551ff92d004f319fb4b73)
+++ lams_central/web/includes/javascript/openUrls.js (.../openUrls.js) (revision 9ec094b99f07058e55715478a99c77423acda2f9)
@@ -49,35 +49,39 @@
function openMonitorLesson( lessonID, url ) {
if (!url) {
- url = '/lams/home/monitorLesson.do';
+ url = '/lams/home/monitorLesson.do?';
}
+ url += 'lessonID='+ lessonID;
if (isMac) {
if(belowMinRes) {
- monitorLessonWin = window.open(url + '?lessonID='+ lessonID,'mWindow','width=' + monitor_width
+ monitorLessonWin = window.open(url,'mWindow','width=' + monitor_width
+ ',height=' + monitor_height + ',resizable,scrollbars' + getCenterParams(monitor_width, monitor_height));
} else {
- monitorLessonWin = window.open(url + '?lessonID='+lessonID,'mWindow','width=' + monitor_width
+ monitorLessonWin = window.open(url,'mWindow','width=' + monitor_width
+ ',height=' + monitor_height + ',resizable,scrollbars' + getCenterParams(monitor_width, monitor_height));
}
} else {
if (monitorLessonWin && !monitorLessonWin.closed) {
- monitorLessonWin.location = url + '?lessonID='+lessonID;
+ monitorLessonWin.location = url;
monitorLessonWin.focus();
} else {
- monitorLessonWin = window.open(url + '?lessonID='+lessonID,'mWindow','width=' + monitor_width
+ monitorLessonWin = window.open(url,'mWindow','width=' + monitor_width
+ ',height=' + monitor_height + ',resizable,resizable,scrollbars'
+ getCenterParams(monitor_width, monitor_height));
}
}
}
function openTBLMonitorLesson( lessonID ) {
- openMonitorLesson(lessonID, '/lams/monitoring/tblmonitor/start.do')
+ openMonitorLesson(lessonID, '/lams/monitoring/tblmonitor/start.do?')
}
-function openLearner( lessonId ) {
- var learnerUrl = '/lams/home/learner.do?lessonID=' + lessonId;
+function openLearner( lessonId, url ) {
+ if (!url) {
+ url = '/lams/home/learner.do?';
+ }
+ var learnerUrl = url + 'lessonID=' + lessonId;
if (isMac) {
learnWin = window.open(learnerUrl,'lWindow','width=' + learner_width + ',height=' + learner_height