Index: lams_central/web/includes/javascript/openUrls.js
===================================================================
diff -u -rdda4ba88f5e0bd4d7e59f1e3b31914fd6a563208 -re456cbdff56a950306015c2e58a9c0460cba7888
--- lams_central/web/includes/javascript/openUrls.js (.../openUrls.js) (revision dda4ba88f5e0bd4d7e59f1e3b31914fd6a563208)
+++ lams_central/web/includes/javascript/openUrls.js (.../openUrls.js) (revision e456cbdff56a950306015c2e58a9c0460cba7888)
@@ -50,27 +50,26 @@
}
}
}
-
- function openAuthor()
- {
-
+
+ function openAuthor(learningDesignId){
+ var learningDesignParam = learningDesignId==null ? "":"&learningDesignID="+learningDesignId;
if(isMac)
- {
- authorWin = window.open('home.do?method=author','aWindow','width=' + authoring_width + ',height=' + authoring_height + ',resizable');
- }
- else
- {
- if(authorWin && !authorWin.closed)
{
- //authorWin.location = 'home.do?method=author';
- authorWin.focus();
+ authorWin = window.open('home.do?method=author'+learningDesignParam,'aWindow','width=' + authoring_width + ',height=' + authoring_height + ',resizable');
}
- else
+ else
{
- authorWin = window.open('home.do?method=author','aWindow','width=' + authoring_width + ',height=' + authoring_height + ',resizable');
- authorWin.focus();
+ if(authorWin && !authorWin.closed)
+ {
+ //authorWin.location = 'home.do?method=author';
+ authorWin.focus();
+ }
+ else
+ {
+ authorWin = window.open('home.do?method=author'+learningDesignParam,'aWindow','width=' + authoring_width + ',height=' + authoring_height + ',resizable');
+ authorWin.focus();
+ }
}
- }
}
function openAuthorForEditOnFly( learningDesignID )
Index: lams_central/web/includes/javascript/pedagogicalPlanner.js
===================================================================
diff -u -r3fe05cc69b1d0cfa2cb494a4778a8ab00dec2d60 -re456cbdff56a950306015c2e58a9c0460cba7888
--- lams_central/web/includes/javascript/pedagogicalPlanner.js (.../pedagogicalPlanner.js) (revision 3fe05cc69b1d0cfa2cb494a4778a8ab00dec2d60)
+++ lams_central/web/includes/javascript/pedagogicalPlanner.js (.../pedagogicalPlanner.js) (revision e456cbdff56a950306015c2e58a9c0460cba7888)
@@ -6,6 +6,7 @@
var activitiesResponded = 0; //Number of activities that responded
var actionAfterCompleted; //What action should be called if all activities were saved successfully
var startPreviewUrl; //Url to start preview
+ var learningDesignId; //ID of the design to open
var ACTION_DO_NOTHING = 0; //After successful submit do nothing
var ACTION_PREVIEW = 1; //After successful submit start preview
@@ -20,6 +21,9 @@
if (actionAfterCompleted==ACTION_PREVIEW){
startPreviewUrl=additionalParameter;
}
+ else if (actionAfterCompleted==ACTION_OPEN_AUTHOR){
+ learningDesignId=additionalParameter;
+ }
callAttemptedID++;
//Clear any current messages
@@ -131,7 +135,7 @@
window.open(startPreviewUrl,'Preview','width=800,height=600,scrollbars=yes,resizable=yes');
}
else if (actionAfterCompleted==ACTION_OPEN_AUTHOR){
- openAuthor();
+ openAuthor(learningDesignId);
}
}
else {
Index: lams_central/web/pedagogical_planner/base.jsp
===================================================================
diff -u -r05db875c7974d705f89231416ff6dfe91a5e70f1 -re456cbdff56a950306015c2e58a9c0460cba7888
--- lams_central/web/pedagogical_planner/base.jsp (.../base.jsp) (revision 05db875c7974d705f89231416ff6dfe91a5e70f1)
+++ lams_central/web/pedagogical_planner/base.jsp (.../base.jsp) (revision e456cbdff56a950306015c2e58a9c0460cba7888)
@@ -139,6 +139,6 @@
-
+
\ No newline at end of file