Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.48 -r1.49
--- lams_central/conf/language/lams/ApplicationResources.properties 14 Jan 2009 10:44:46 -0000 1.48
+++ lams_central/conf/language/lams/ApplicationResources.properties 26 Jan 2009 10:13:14 -0000 1.49
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.44 -r1.45
--- lams_central/conf/language/lams/ApplicationResources_en_AU.properties 14 Jan 2009 10:44:46 -0000 1.44
+++ lams_central/conf/language/lams/ApplicationResources_en_AU.properties 26 Jan 2009 10:13:14 -0000 1.45
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/openUrls.js,v
diff -u -r1.31 -r1.32
--- lams_central/web/includes/javascript/openUrls.js 24 Jan 2009 14:00:03 -0000 1.31
+++ lams_central/web/includes/javascript/openUrls.js 26 Jan 2009 10:13:14 -0000 1.32
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/pedagogicalPlanner.js,v
diff -u -r1.5 -r1.6
--- lams_central/web/includes/javascript/pedagogicalPlanner.js 24 Jan 2009 14:00:03 -0000 1.5
+++ lams_central/web/includes/javascript/pedagogicalPlanner.js 26 Jan 2009 10:13:14 -0000 1.6
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/pedagogical_planner/Attic/base.jsp,v
diff -u -r1.3 -r1.4
--- lams_central/web/pedagogical_planner/base.jsp 24 Jan 2009 14:00:03 -0000 1.3
+++ lams_central/web/pedagogical_planner/base.jsp 26 Jan 2009 10:13:14 -0000 1.4
@@ -107,7 +107,7 @@