Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java,v diff -u -r1.11.2.3 -r1.11.2.4 --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java 11 May 2016 07:37:40 -0000 1.11.2.3 +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java 5 Aug 2016 12:40:32 -0000 1.11.2.4 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/WikiPageAction.java,v diff -u -r1.15.2.4 -r1.15.2.5 --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/WikiPageAction.java 11 May 2016 07:37:40 -0000 1.15.2.4 +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/WikiPageAction.java 5 Aug 2016 12:40:32 -0000 1.15.2.5 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki/web/pages/learning/wiki.jsp,v diff -u -r1.25.2.4 -r1.25.2.5 --- lams_tool_wiki/web/pages/learning/wiki.jsp 23 Jul 2016 10:13:57 -0000 1.25.2.4 +++ lams_tool_wiki/web/pages/learning/wiki.jsp 5 Aug 2016 12:40:33 -0000 1.25.2.5 @@ -49,11 +49,11 @@ --> + + + -
-
-
@@ -62,8 +62,6 @@ ${fn:escapeXml(currentWikiPage.title)} - - @@ -239,7 +237,7 @@
- + @@ -432,10 +430,8 @@
-
-
- +