Fisheye: Tag ffbc47494b72d5222b6fc95db0347f7732d93310 refers to a dead (removed) revision in file `lams_central/web/common.js'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_central/web/includes/javascript/common.js =================================================================== diff -u --- lams_central/web/includes/javascript/common.js (revision 0) +++ lams_central/web/includes/javascript/common.js (revision ffbc47494b72d5222b6fc95db0347f7732d93310) @@ -0,0 +1,18 @@ + + + var instructionsWindow = null; + /** + * Launches the popup window for the instruction files + */ + function launchInstructionsPopup(url) { +// add the mac test back in when we have the platform detection working. +// if(mac){ +// window.open(url,'instructions','resizable,width=796,height=570,scrollbars'); +// }else{ + if(instructionsWindow && instructionsWindow.open && !instructionsWindow.closed){ + instructionsWindow.close(); + } + instructionsWindow = window.open(url,'instructions','resizable,width=796,height=570,scrollbars'); + instructionsWindow.window.focus(); +// } + } \ No newline at end of file Index: lams_contentrepository/doc/org/lamsfoundation/lams/contentrepository/client/ToolDownload.html =================================================================== diff -u -r420d00e2236663754afd02c3cedb598684bee219 -rffbc47494b72d5222b6fc95db0347f7732d93310 --- lams_contentrepository/doc/org/lamsfoundation/lams/contentrepository/client/ToolDownload.html (.../ToolDownload.html) (revision 420d00e2236663754afd02c3cedb598684bee219) +++ lams_contentrepository/doc/org/lamsfoundation/lams/contentrepository/client/ToolDownload.html (.../ToolDownload.html) (revision ffbc47494b72d5222b6fc95db0347f7732d93310) @@ -140,7 +140,7 @@ </tr>

- The launchInstructionsPopup() method is defined in common.js, available as http://.../lams/common.js. + The launchInstructionsPopup() method is defined in common.js, available as http://.../lams/includes/javascript/common.js.

For an example of this servlet being used, have a look at the lams_tool_imscp project. The jsps/authoring/forum/instructions.jsp calls the servlet and includes/header.jsp Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/ToolDownload.java =================================================================== diff -u -r0913afb336848e1d400326b0219be2a1d301cab8 -rffbc47494b72d5222b6fc95db0347f7732d93310 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/ToolDownload.java (.../ToolDownload.java) (revision 0913afb336848e1d400326b0219be2a1d301cab8) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/ToolDownload.java (.../ToolDownload.java) (revision ffbc47494b72d5222b6fc95db0347f7732d93310) @@ -71,7 +71,7 @@ * </tr> * *

- * The launchInstructionsPopup() method is defined in common.js, available as http://.../lams/common.js. + * The launchInstructionsPopup() method is defined in common.js, available as http://.../lams/includes/javascript/common.js. *

* For an example of this servlet being used, have a look at the lams_tool_imscp project. * The jsps/authoring/forum/instructions.jsp calls the servlet and includes/header.jsp Index: lams_tool_forum/web/includes/header.jsp =================================================================== diff -u -r2c810bb0c592aa2a70f4c858f1b81a2e61c6012b -rffbc47494b72d5222b6fc95db0347f7732d93310 --- lams_tool_forum/web/includes/header.jsp (.../header.jsp) (revision 2c810bb0c592aa2a70f4c858f1b81a2e61c6012b) +++ lams_tool_forum/web/includes/header.jsp (.../header.jsp) (revision ffbc47494b72d5222b6fc95db0347f7732d93310) @@ -12,7 +12,7 @@ <bean:message key="appName" /> - + Index: lams_tool_nb/web/author_page.jsp =================================================================== diff -u -r3ad37c97c32e04b4ade88782c5e1ff70db9e3bc3 -rffbc47494b72d5222b6fc95db0347f7732d93310 --- lams_tool_nb/web/author_page.jsp (.../author_page.jsp) (revision 3ad37c97c32e04b4ade88782c5e1ff70db9e3bc3) +++ lams_tool_nb/web/author_page.jsp (.../author_page.jsp) (revision ffbc47494b72d5222b6fc95db0347f7732d93310) @@ -23,7 +23,7 @@ Noticeboard tool - + Index: lams_tool_nb/web/template/template.jsp =================================================================== diff -u -r2769a06599675ceac458c4a6714fd19338e27520 -rffbc47494b72d5222b6fc95db0347f7732d93310 --- lams_tool_nb/web/template/template.jsp (.../template.jsp) (revision 2769a06599675ceac458c4a6714fd19338e27520) +++ lams_tool_nb/web/template/template.jsp (.../template.jsp) (revision ffbc47494b72d5222b6fc95db0347f7732d93310) @@ -42,7 +42,7 @@ <tiles:getAsString name="title"/> - + Index: lams_tool_sbmt/web/authoring/authoring.jsp =================================================================== diff -u -rd4ea565b3e9dcc2b1ca6039c250ca18b1978784d -rffbc47494b72d5222b6fc95db0347f7732d93310 --- lams_tool_sbmt/web/authoring/authoring.jsp (.../authoring.jsp) (revision d4ea565b3e9dcc2b1ca6039c250ca18b1978784d) +++ lams_tool_sbmt/web/authoring/authoring.jsp (.../authoring.jsp) (revision ffbc47494b72d5222b6fc95db0347f7732d93310) @@ -16,7 +16,7 @@ } - + Index: lams_tool_sbmt/web/monitoring/editactivity.jsp =================================================================== diff -u -r7c5efc56bcb4c6f09317c7fa044937505c128483 -rffbc47494b72d5222b6fc95db0347f7732d93310 --- lams_tool_sbmt/web/monitoring/editactivity.jsp (.../editactivity.jsp) (revision 7c5efc56bcb4c6f09317c7fa044937505c128483) +++ lams_tool_sbmt/web/monitoring/editactivity.jsp (.../editactivity.jsp) (revision ffbc47494b72d5222b6fc95db0347f7732d93310) @@ -8,7 +8,7 @@ Submit Files - + Index: lams_tool_sbmt/web/monitoring/instructions.jsp =================================================================== diff -u -r6dc489ffc6bc1ff7b073f5c98ad518aafcd1e5cd -rffbc47494b72d5222b6fc95db0347f7732d93310 --- lams_tool_sbmt/web/monitoring/instructions.jsp (.../instructions.jsp) (revision 6dc489ffc6bc1ff7b073f5c98ad518aafcd1e5cd) +++ lams_tool_sbmt/web/monitoring/instructions.jsp (.../instructions.jsp) (revision ffbc47494b72d5222b6fc95db0347f7732d93310) @@ -7,7 +7,7 @@ Monitoring Instructions - +

Index: lams_tool_sbmt/web/monitoring/usermarkslist.jsp =================================================================== diff -u -r6dc489ffc6bc1ff7b073f5c98ad518aafcd1e5cd -rffbc47494b72d5222b6fc95db0347f7732d93310 --- lams_tool_sbmt/web/monitoring/usermarkslist.jsp (.../usermarkslist.jsp) (revision 6dc489ffc6bc1ff7b073f5c98ad518aafcd1e5cd) +++ lams_tool_sbmt/web/monitoring/usermarkslist.jsp (.../usermarkslist.jsp) (revision ffbc47494b72d5222b6fc95db0347f7732d93310) @@ -6,7 +6,7 @@ Files Submitted - + Index: lams_tool_sbmt/web/monitoring/viewallmarks.jsp =================================================================== diff -u -r6dc489ffc6bc1ff7b073f5c98ad518aafcd1e5cd -rffbc47494b72d5222b6fc95db0347f7732d93310 --- lams_tool_sbmt/web/monitoring/viewallmarks.jsp (.../viewallmarks.jsp) (revision 6dc489ffc6bc1ff7b073f5c98ad518aafcd1e5cd) +++ lams_tool_sbmt/web/monitoring/viewallmarks.jsp (.../viewallmarks.jsp) (revision ffbc47494b72d5222b6fc95db0347f7732d93310) @@ -5,7 +5,7 @@ All Learner Submission Details - +