Index: lams_admin/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.13 -r1.14
--- lams_admin/web/WEB-INF/tags/AuthoringButton.tag	3 Jul 2012 12:56:40 -0000	1.13
+++ lams_admin/web/WEB-INF/tags/AuthoringButton.tag	6 Jul 2012 15:39:01 -0000	1.14
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_central/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.20 -r1.21
--- lams_central/web/WEB-INF/tags/AuthoringButton.tag	3 Jul 2012 12:57:32 -0000	1.20
+++ lams_central/web/WEB-INF/tags/AuthoringButton.tag	6 Jul 2012 15:39:11 -0000	1.21
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_gradebook/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.7 -r1.8
--- lams_gradebook/web/WEB-INF/tags/AuthoringButton.tag	3 Jul 2012 12:56:19 -0000	1.7
+++ lams_gradebook/web/WEB-INF/tags/AuthoringButton.tag	6 Jul 2012 15:38:59 -0000	1.8
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_learning/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.17 -r1.18
Binary files differ
Index: lams_monitoring/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.13 -r1.14
--- lams_monitoring/web/WEB-INF/tags/AuthoringButton.tag	3 Jul 2012 12:56:47 -0000	1.13
+++ lams_monitoring/web/WEB-INF/tags/AuthoringButton.tag	6 Jul 2012 15:39:07 -0000	1.14
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_tool_assessment/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.11 -r1.12
--- lams_tool_assessment/web/WEB-INF/tags/AuthoringButton.tag	3 Jul 2012 12:56:59 -0000	1.11
+++ lams_tool_assessment/web/WEB-INF/tags/AuthoringButton.tag	6 Jul 2012 15:38:58 -0000	1.12
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_tool_bbb/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_bbb/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.6 -r1.7
--- lams_tool_bbb/web/WEB-INF/tags/AuthoringButton.tag	3 Jul 2012 12:57:14 -0000	1.6
+++ lams_tool_bbb/web/WEB-INF/tags/AuthoringButton.tag	6 Jul 2012 15:38:55 -0000	1.7
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_tool_chat/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.17 -r1.18
--- lams_tool_chat/web/WEB-INF/tags/AuthoringButton.tag	3 Jul 2012 12:58:03 -0000	1.17
+++ lams_tool_chat/web/WEB-INF/tags/AuthoringButton.tag	6 Jul 2012 15:39:04 -0000	1.18
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_tool_daco/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.9 -r1.10
--- lams_tool_daco/web/WEB-INF/tags/AuthoringButton.tag	3 Jul 2012 12:57:25 -0000	1.9
+++ lams_tool_daco/web/WEB-INF/tags/AuthoringButton.tag	6 Jul 2012 15:38:47 -0000	1.10
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_tool_dimdim/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/web/WEB-INF/tags/Attic/AuthoringButton.tag,v
diff -u -r1.8 -r1.9
--- lams_tool_dimdim/web/WEB-INF/tags/AuthoringButton.tag	3 Jul 2012 12:58:00 -0000	1.8
+++ lams_tool_dimdim/web/WEB-INF/tags/AuthoringButton.tag	6 Jul 2012 15:38:37 -0000	1.9
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_tool_eadventure/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_eadventure/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.8 -r1.9
--- lams_tool_eadventure/web/WEB-INF/tags/AuthoringButton.tag	3 Jul 2012 12:57:54 -0000	1.8
+++ lams_tool_eadventure/web/WEB-INF/tags/AuthoringButton.tag	6 Jul 2012 15:38:43 -0000	1.9
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.19 -r1.20
--- lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag	3 Jul 2012 12:56:33 -0000	1.19
+++ lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag	6 Jul 2012 15:38:40 -0000	1.20
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.11 -r1.12
--- lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag	3 Jul 2012 12:57:48 -0000	1.11
+++ lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag	6 Jul 2012 15:39:21 -0000	1.12
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_tool_images/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.8 -r1.9
--- lams_tool_images/web/WEB-INF/tags/AuthoringButton.tag	3 Jul 2012 12:57:05 -0000	1.8
+++ lams_tool_images/web/WEB-INF/tags/AuthoringButton.tag	6 Jul 2012 15:39:15 -0000	1.9
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_tool_imscc/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.6 -r1.7
--- lams_tool_imscc/web/WEB-INF/tags/AuthoringButton.tag	3 Jul 2012 12:58:07 -0000	1.6
+++ lams_tool_imscc/web/WEB-INF/tags/AuthoringButton.tag	6 Jul 2012 15:38:41 -0000	1.7
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_tool_lamc/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.16 -r1.17
--- lams_tool_lamc/web/WEB-INF/tags/AuthoringButton.tag	3 Jul 2012 12:57:41 -0000	1.16
+++ lams_tool_lamc/web/WEB-INF/tags/AuthoringButton.tag	6 Jul 2012 15:38:56 -0000	1.17
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_tool_laqa/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.17 -r1.18
--- lams_tool_laqa/web/WEB-INF/tags/AuthoringButton.tag	3 Jul 2012 12:57:28 -0000	1.17
+++ lams_tool_laqa/web/WEB-INF/tags/AuthoringButton.tag	6 Jul 2012 15:39:02 -0000	1.18
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.20 -r1.21
--- lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag	3 Jul 2012 12:57:35 -0000	1.20
+++ lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag	6 Jul 2012 15:39:18 -0000	1.21
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_tool_mindmap/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.7 -r1.8
--- lams_tool_mindmap/web/WEB-INF/tags/AuthoringButton.tag	3 Jul 2012 12:57:18 -0000	1.7
+++ lams_tool_mindmap/web/WEB-INF/tags/AuthoringButton.tag	6 Jul 2012 15:39:17 -0000	1.8
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_tool_nb/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.17 -r1.18
--- lams_tool_nb/web/WEB-INF/tags/AuthoringButton.tag	3 Jul 2012 12:57:38 -0000	1.17
+++ lams_tool_nb/web/WEB-INF/tags/AuthoringButton.tag	6 Jul 2012 15:38:38 -0000	1.18
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_tool_notebook/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.15 -r1.16
Binary files differ
Index: lams_tool_pixlr/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_pixlr/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.8 -r1.9
--- lams_tool_pixlr/web/WEB-INF/tags/AuthoringButton.tag	3 Jul 2012 12:56:50 -0000	1.8
+++ lams_tool_pixlr/web/WEB-INF/tags/AuthoringButton.tag	6 Jul 2012 15:39:05 -0000	1.9
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_tool_sbmt/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.18 -r1.19
--- lams_tool_sbmt/web/WEB-INF/tags/AuthoringButton.tag	3 Jul 2012 12:56:36 -0000	1.18
+++ lams_tool_sbmt/web/WEB-INF/tags/AuthoringButton.tag	6 Jul 2012 15:39:20 -0000	1.19
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_tool_scribe/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.15 -r1.16
--- lams_tool_scribe/web/WEB-INF/tags/AuthoringButton.tag	3 Jul 2012 12:57:51 -0000	1.15
+++ lams_tool_scribe/web/WEB-INF/tags/AuthoringButton.tag	6 Jul 2012 15:38:35 -0000	1.16
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.8 -r1.9
--- lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringButton.tag	3 Jul 2012 12:56:56 -0000	1.8
+++ lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringButton.tag	6 Jul 2012 15:38:50 -0000	1.9
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_tool_survey/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.14 -r1.15
--- lams_tool_survey/web/WEB-INF/tags/AuthoringButton.tag	3 Jul 2012 12:57:57 -0000	1.14
+++ lams_tool_survey/web/WEB-INF/tags/AuthoringButton.tag	6 Jul 2012 15:39:14 -0000	1.15
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_tool_task/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.10 -r1.11
--- lams_tool_task/web/WEB-INF/tags/AuthoringButton.tag	3 Jul 2012 12:56:30 -0000	1.10
+++ lams_tool_task/web/WEB-INF/tags/AuthoringButton.tag	6 Jul 2012 15:38:45 -0000	1.11
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_tool_videorecorder/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_videorecorder/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.8 -r1.9
--- lams_tool_videorecorder/web/WEB-INF/tags/AuthoringButton.tag	3 Jul 2012 12:56:25 -0000	1.8
+++ lams_tool_videorecorder/web/WEB-INF/tags/AuthoringButton.tag	6 Jul 2012 15:39:13 -0000	1.9
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_tool_vote/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.17 -r1.18
--- lams_tool_vote/web/WEB-INF/tags/AuthoringButton.tag	3 Jul 2012 12:56:53 -0000	1.17
+++ lams_tool_vote/web/WEB-INF/tags/AuthoringButton.tag	6 Jul 2012 15:38:46 -0000	1.18
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_tool_wiki/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.8 -r1.9
--- lams_tool_wiki/web/WEB-INF/tags/AuthoringButton.tag	3 Jul 2012 12:57:02 -0000	1.8
+++ lams_tool_wiki/web/WEB-INF/tags/AuthoringButton.tag	6 Jul 2012 15:38:49 -0000	1.9
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_tool_wookie/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wookie/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.6 -r1.7
--- lams_tool_wookie/web/WEB-INF/tags/AuthoringButton.tag	3 Jul 2012 12:57:22 -0000	1.6
+++ lams_tool_wookie/web/WEB-INF/tags/AuthoringButton.tag	6 Jul 2012 15:38:34 -0000	1.7
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_www/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_www/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.12 -r1.13
--- lams_www/web/WEB-INF/tags/AuthoringButton.tag	3 Jul 2012 12:57:11 -0000	1.12
+++ lams_www/web/WEB-INF/tags/AuthoringButton.tag	6 Jul 2012 15:39:10 -0000	1.13
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();