Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java =================================================================== diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r1980c17755d5ddc7da8545b352cd45a84f30c0f3 --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java (.../LearningAction.java) (revision 2f725f8ef2aa09a2663b2335bf67213074426d11) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java (.../LearningAction.java) (revision 1980c17755d5ddc7da8545b352cd45a84f30c0f3) @@ -235,6 +235,8 @@ HttpServletResponse response, Long currentWikiPageId) throws Exception { LearningForm learnForm = (LearningForm) form; learnForm.setCurrentWikiPageId(currentWikiPageId); + // put the tool session id in the attributes so that the progress bar can pick it up. + request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, learnForm.getToolSessionID()); return unspecified(mapping, learnForm, request, response); } Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/WikiPageAction.java =================================================================== diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r1980c17755d5ddc7da8545b352cd45a84f30c0f3 --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/WikiPageAction.java (.../WikiPageAction.java) (revision 2f725f8ef2aa09a2663b2335bf67213074426d11) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/WikiPageAction.java (.../WikiPageAction.java) (revision 1980c17755d5ddc7da8545b352cd45a84f30c0f3) @@ -205,8 +205,12 @@ // Send revert notifications if ((toolSessionID != null) && (user != null)) { notifyWikiChange(toolSessionID, "notify.pageEdited.subject", "notify.pageEdited.body", user, request); + + // put the tool session id in the attributes so that the progress bar can pick it up. + request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, toolSessionID); } + return unspecified(mapping, wikiForm, request, response); } Index: lams_tool_wiki/web/pages/learning/wiki.jsp =================================================================== diff -u -r84f22eb86e0f51d538085ce5ea08424f9490056a -r1980c17755d5ddc7da8545b352cd45a84f30c0f3 --- lams_tool_wiki/web/pages/learning/wiki.jsp (.../wiki.jsp) (revision 84f22eb86e0f51d538085ce5ea08424f9490056a) +++ lams_tool_wiki/web/pages/learning/wiki.jsp (.../wiki.jsp) (revision 1980c17755d5ddc7da8545b352cd45a84f30c0f3) @@ -49,11 +49,11 @@ --> + + + -
-
-
@@ -62,8 +62,6 @@ ${fn:escapeXml(currentWikiPage.title)} - - @@ -239,7 +237,7 @@
- + @@ -432,10 +430,8 @@
-
-
- +