Index: lams_central/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r3636757b4afafb785ae0c6c8295a969c605f8e28 -ra301da49ef54944c21a4c78c60a2637959be30b5 --- lams_central/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 3636757b4afafb785ae0c6c8295a969c605f8e28) +++ lams_central/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision a301da49ef54944c21a4c78c60a2637959be30b5) @@ -242,4 +242,6 @@ label.planner.grouping.number.of.learners=Number of learners error.planner.grouping.number.integer=Provided value must be a positive integer number. label.planner.grouping.equal.group.size=Equal group sizes + +msg.planner.not.saved =Are you sure you want to close? If you have not saved the design, changes you have made will be lost. #======= End labels: Exported 216 labels for en AU ===== Index: lams_central/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -r3636757b4afafb785ae0c6c8295a969c605f8e28 -ra301da49ef54944c21a4c78c60a2637959be30b5 --- lams_central/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 3636757b4afafb785ae0c6c8295a969c605f8e28) +++ lams_central/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision a301da49ef54944c21a4c78c60a2637959be30b5) @@ -242,4 +242,5 @@ label.planner.grouping.number.of.learners=Number of learners error.planner.grouping.number.integer=Provided value must be a positive integer number. label.planner.grouping.equal.group.size=Equal group sizes +msg.planner.not.saved =Are you sure you want to close? If you have not saved the design, changes you have made will be lost. #======= End labels: Exported 216 labels for en AU ===== Index: lams_central/web/includes/javascript/openUrls.js =================================================================== diff -u -r0cf0add4991151d21aeac41ddca7a40e76dc78f6 -ra301da49ef54944c21a4c78c60a2637959be30b5 --- lams_central/web/includes/javascript/openUrls.js (.../openUrls.js) (revision 0cf0add4991151d21aeac41ddca7a40e76dc78f6) +++ lams_central/web/includes/javascript/openUrls.js (.../openUrls.js) (revision a301da49ef54944c21a4c78c60a2637959be30b5) @@ -74,7 +74,7 @@ function openPedagogicalPlanner(){ if(isMac) { - authorWin = window.open('pedagogicalPlanner.do','aWindow','width=' + authoring_width + ',height=' + authoring_height + ',resizable,scrollbars'); + authorWin = window.open('pedagogicalPlanner.do','aWindow','width=' + authoring_width + ',height=' + screen.height + ',resizable,scrollbars'); } else { @@ -84,7 +84,7 @@ } else { - authorWin = window.open('pedagogicalPlanner.do','aWindow','width=' + authoring_width + ',height=' + authoring_height + ',resizable,scrollbars'); + authorWin = window.open('pedagogicalPlanner.do','aWindow','width=' + authoring_width + ',height=' + screen.height + ',resizable,scrollbars'); authorWin.focus(); } } Index: lams_central/web/includes/javascript/pedagogicalPlanner.js =================================================================== diff -u -r0cf0add4991151d21aeac41ddca7a40e76dc78f6 -ra301da49ef54944c21a4c78c60a2637959be30b5 --- lams_central/web/includes/javascript/pedagogicalPlanner.js (.../pedagogicalPlanner.js) (revision 0cf0add4991151d21aeac41ddca7a40e76dc78f6) +++ lams_central/web/includes/javascript/pedagogicalPlanner.js (.../pedagogicalPlanner.js) (revision a301da49ef54944c21a4c78c60a2637959be30b5) @@ -141,6 +141,7 @@ window.open(startPreviewUrl,'Preview','width=800,height=600,scrollbars=yes,resizable=yes'); } else if (actionAfterCompleted==ACTION_OPEN_AUTHOR){ + window.resizeTo(authoring_width,authoring_height); document.location.href="home.do?method=author&learningDesignID="+learningDesignId; } } @@ -151,4 +152,10 @@ $('#pedagogicalPlannerErrorArea').show(); } } + } + + function closePlanner(text){ + if (confirm(text)){ + window.close(); + } } \ No newline at end of file Index: lams_central/web/pedagogical_planner/base.jsp =================================================================== diff -u -r0cf0add4991151d21aeac41ddca7a40e76dc78f6 -ra301da49ef54944c21a4c78c60a2637959be30b5 --- lams_central/web/pedagogical_planner/base.jsp (.../base.jsp) (revision 0cf0add4991151d21aeac41ddca7a40e76dc78f6) +++ lams_central/web/pedagogical_planner/base.jsp (.../base.jsp) (revision a301da49ef54944c21a4c78c60a2637959be30b5) @@ -107,7 +107,7 @@
- + ');">