Index: lams_tool_wiki/conf/language/ApplicationResources.properties =================================================================== diff -u -ra765c868e65385168275af7a88c5391097ecdf35 -rff341c0d1e171ace0d2144ed148472745449c066 --- lams_tool_wiki/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision a765c868e65385168275af7a88c5391097ecdf35) +++ lams_tool_wiki/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision ff341c0d1e171ace0d2144ed148472745449c066) @@ -32,6 +32,7 @@ advanced.allowLearnerCreatePages =Allow learners to create new Wiki pages advanced.allowLearnerInsertLinks =Allow learners to insert external links into Wiki advanced.allowLearnerAttachImages =Allow learners to attach images to Wiki +advanced.notifyChange =Send email notification to monitors when the Wiki is changed advanced.reflectOnActivity =Add Notebook at end of Wiki with the following instructions: message.no.reflection.available =No notebook available advanced.editingLimits =Editing Limits @@ -103,18 +104,22 @@ label.authoring.basic.instructions =Instructions: label.wiki.body =Wiki Body label.wiki.edit =Edit +label.wiki.edit.toolTip =Edit the current Wiki page label.wiki.add =Add +label.wiki.add.toolTip =Add a new Wiki page to this Wiki label.wiki.add.title.exists =A Wiki page with title "{0}" already exists, please choose a different title. label.wiki.add.title.required =A title is required for the Wiki page. label.wiki.last.edit =Last edited by {0}, at {1} label.wiki.view =View +label.wiki.view.toolTip =View this Wiki page label.wiki.remove =Remove +label.wiki.remove.toolTip =Remove this Wiki page label.wiki.remove.confirm =Delete entire Wiki page? This action cannot be undone. label.wiki.pages =Wiki Pages -label.wiki.main =(Main) label.wiki.savechanges =Save changes label.wiki.remove.confirm =Are you sure you want to delete this Wiki page? This action cannot be undone. label.wiki.history =History +label.wiki.history.toolTip =View previous versions of this Wiki page label.wiki.history.version =Version label.wiki.history.empty =There are no previous versions of this Wiki page. label.wiki.history.date =Edit Date @@ -141,5 +146,14 @@ monitor.notebooks =Notebook Reflections output.learner.number.of.edits =Number of page edits output.learner.number.of.add =Number of pages added +notify.pageEdited.subject =LAMS Wiki page has been edited for {0}. +notify.pageAdded.subject =LAMS Wiki page has been added for {0}. +notify.pageRemoved.subject =LAMS Wiki page has been removed for {0}. +notify.pageEdited.body =A Wiki page has been edited by {0} for {1}. To see the page, go to {2} +notify.pageAdded.body =A Wiki page has been added by {0} for {1}. To see the page, go to {2} +notify.pageRemoved.body =A Wiki page has been removed by {0} for {1}. To see the Wiki, go to {2} +notify.learner.subscribe =Subscribe +notify.learner.unsubscribe =Unsubscribe +notify.learner.query ={0} to notifications by email each time the Wiki is edited. #======= End labels: Exported 81 labels for en AU ===== Index: lams_tool_wiki/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -ra765c868e65385168275af7a88c5391097ecdf35 -rff341c0d1e171ace0d2144ed148472745449c066 --- lams_tool_wiki/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision a765c868e65385168275af7a88c5391097ecdf35) +++ lams_tool_wiki/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision ff341c0d1e171ace0d2144ed148472745449c066) @@ -32,6 +32,7 @@ advanced.allowLearnerCreatePages =Allow learners to create new Wiki pages advanced.allowLearnerInsertLinks =Allow learners to insert external links into Wiki advanced.allowLearnerAttachImages =Allow learners to attach images to Wiki +advanced.notifyChange =Send email notification to monitors when the Wiki is changed advanced.reflectOnActivity =Add Notebook at end of Wiki with the following instructions: message.no.reflection.available =No notebook available advanced.editingLimits =Editing Limits @@ -103,18 +104,22 @@ label.authoring.basic.instructions =Instructions: label.wiki.body =Wiki Body label.wiki.edit =Edit +label.wiki.edit.toolTip =Edit the current Wiki page label.wiki.add =Add +label.wiki.add.toolTip =Add a new Wiki page to this Wiki label.wiki.add.title.exists =A Wiki page with title "{0}" already exists, please choose a different title. label.wiki.add.title.required =A title is required for the Wiki page. label.wiki.last.edit =Last edited by {0}, at {1} label.wiki.view =View +label.wiki.view.toolTip =View this Wiki page label.wiki.remove =Remove +label.wiki.remove.toolTip =Remove this Wiki page label.wiki.remove.confirm =Delete entire Wiki page? This action cannot be undone. label.wiki.pages =Wiki Pages -label.wiki.main =(Main) label.wiki.savechanges =Save changes label.wiki.remove.confirm =Are you sure you want to delete this Wiki page? This action cannot be undone. label.wiki.history =History +label.wiki.history.toolTip =View previous versions of this Wiki page label.wiki.history.version =Version label.wiki.history.empty =There are no previous versions of this Wiki page. label.wiki.history.date =Edit Date @@ -141,5 +146,14 @@ monitor.notebooks =Notebook Reflections output.learner.number.of.edits =Number of page edits output.learner.number.of.add =Number of pages added +notify.pageEdited.subject =LAMS Wiki page has been edited for {0}. +notify.pageAdded.subject =LAMS Wiki page has been added for {0}. +notify.pageRemoved.subject =LAMS Wiki page has been removed for {0}. +notify.pageEdited.body =A Wiki page has been edited by {0} for {1}. To see the page, go to {2} +notify.pageAdded.body =A Wiki page has been added by {0} for {1}. To see the page, go to {2} +notify.pageRemoved.body =A Wiki page has been removed by {0} for {1}. To see the Wiki, go to {2} +notify.learner.subscribe =Subscribe +notify.learner.unsubscribe =Unsubscribe +notify.learner.query ={0} to notifications by email each time the Wiki is edited. #======= End labels: Exported 81 labels for en AU ===== Index: lams_tool_wiki/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -rf08d91b95c1892c71594dd4f7fd6e9b4509cccc7 -rff341c0d1e171ace0d2144ed148472745449c066 --- lams_tool_wiki/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision f08d91b95c1892c71594dd4f7fd6e9b4509cccc7) +++ lams_tool_wiki/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision ff341c0d1e171ace0d2144ed148472745449c066) @@ -147,10 +147,13 @@ output.learner.number.of.edits =Number of page edits output.learner.number.of.add =Number of pages added notify.pageEdited.subject =LAMS Wiki page has been edited for {0}. +notify.pageAdded.subject =LAMS Wiki page has been added for {0}. +notify.pageRemoved.subject =LAMS Wiki page has been removed for {0}. notify.pageEdited.body =A Wiki page has been edited by {0} for {1}. To see the page, go to {2} +notify.pageAdded.body =A Wiki page has been added by {0} for {1}. To see the page, go to {2} +notify.pageRemoved.body =A Wiki page has been removed by {0} for {1}. To see the Wiki, go to {2} notify.learner.subscribe =Subscribe notify.learner.unsubscribe =Unsubscribe notify.learner.query ={0} to notifications by email each time the Wiki is edited. - #======= End labels: Exported 81 labels for en AU ===== Index: lams_tool_wiki/conf/language/rams/ApplicationResources.properties =================================================================== diff -u -ra765c868e65385168275af7a88c5391097ecdf35 -rff341c0d1e171ace0d2144ed148472745449c066 --- lams_tool_wiki/conf/language/rams/ApplicationResources.properties (.../ApplicationResources.properties) (revision a765c868e65385168275af7a88c5391097ecdf35) +++ lams_tool_wiki/conf/language/rams/ApplicationResources.properties (.../ApplicationResources.properties) (revision ff341c0d1e171ace0d2144ed148472745449c066) @@ -32,6 +32,7 @@ advanced.allowLearnerCreatePages =Allow learners to create new Wiki pages advanced.allowLearnerInsertLinks =Allow learners to insert external links into Wiki advanced.allowLearnerAttachImages =Allow learners to attach images to Wiki +advanced.notifyChange =Send email notification to monitors when the Wiki is changed advanced.reflectOnActivity =Add Notebook at end of Wiki with the following instructions: message.no.reflection.available =No notebook available advanced.editingLimits =Editing Limits @@ -103,18 +104,22 @@ label.authoring.basic.instructions =Instructions: label.wiki.body =Wiki Body label.wiki.edit =Edit +label.wiki.edit.toolTip =Edit the current Wiki page label.wiki.add =Add +label.wiki.add.toolTip =Add a new Wiki page to this Wiki label.wiki.add.title.exists =A Wiki page with title "{0}" already exists, please choose a different title. label.wiki.add.title.required =A title is required for the Wiki page. label.wiki.last.edit =Last edited by {0}, at {1} label.wiki.view =View +label.wiki.view.toolTip =View this Wiki page label.wiki.remove =Remove +label.wiki.remove.toolTip =Remove this Wiki page label.wiki.remove.confirm =Delete entire Wiki page? This action cannot be undone. label.wiki.pages =Wiki Pages -label.wiki.main =(Main) label.wiki.savechanges =Save changes label.wiki.remove.confirm =Are you sure you want to delete this Wiki page? This action cannot be undone. label.wiki.history =History +label.wiki.history.toolTip =View previous versions of this Wiki page label.wiki.history.version =Version label.wiki.history.empty =There are no previous versions of this Wiki page. label.wiki.history.date =Edit Date @@ -141,5 +146,14 @@ monitor.notebooks =Notebook Reflections output.learner.number.of.edits =Number of page edits output.learner.number.of.add =Number of pages added +notify.pageEdited.subject =LAMS Wiki page has been edited for {0}. +notify.pageAdded.subject =LAMS Wiki page has been added for {0}. +notify.pageRemoved.subject =LAMS Wiki page has been removed for {0}. +notify.pageEdited.body =A Wiki page has been edited by {0} for {1}. To see the page, go to {2} +notify.pageAdded.body =A Wiki page has been added by {0} for {1}. To see the page, go to {2} +notify.pageRemoved.body =A Wiki page has been removed by {0} for {1}. To see the Wiki, go to {2} +notify.learner.subscribe =Subscribe +notify.learner.unsubscribe =Unsubscribe +notify.learner.query ={0} to notifications by email each time the Wiki is edited. #======= End labels: Exported 81 labels for en AU ===== Index: lams_tool_wiki/conf/language/rams/ApplicationResources_en_AU.properties =================================================================== diff -u -r40fb72d3289330a49552817cf29d032ba4e203a1 -rff341c0d1e171ace0d2144ed148472745449c066 --- lams_tool_wiki/conf/language/rams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 40fb72d3289330a49552817cf29d032ba4e203a1) +++ lams_tool_wiki/conf/language/rams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision ff341c0d1e171ace0d2144ed148472745449c066) @@ -32,6 +32,7 @@ advanced.allowLearnerCreatePages =Allow learners to create new Wiki pages advanced.allowLearnerInsertLinks =Allow learners to insert external links into Wiki advanced.allowLearnerAttachImages =Allow learners to attach images to Wiki +advanced.notifyChange =Send email notification to monitors when the Wiki is changed advanced.reflectOnActivity =Add Notebook at end of Wiki with the following instructions: message.no.reflection.available =No notebook available advanced.editingLimits =Editing Limits @@ -102,23 +103,22 @@ titleHeading.instructions =Instructions label.authoring.basic.instructions =Instructions: label.wiki.body =Wiki Body -label.wiki.edit =Edit Page +label.wiki.edit =Edit label.wiki.edit.toolTip =Edit the current Wiki page -label.wiki.add =Add New Page -label.wiki.add.toolTip =Add a new Wiki page to this wiki +label.wiki.add =Add +label.wiki.add.toolTip =Add a new Wiki page to this Wiki label.wiki.add.title.exists =A Wiki page with title "{0}" already exists, please choose a different title. label.wiki.add.title.required =A title is required for the Wiki page. label.wiki.last.edit =Last edited by {0}, at {1} -label.wiki.view =View Page -label.wiki.view.toolTip =View this wiki page -label.wiki.remove =Remove Page -label.wiki.remove.toolTip =Remove this wiki page +label.wiki.view =View +label.wiki.view.toolTip =View this Wiki page +label.wiki.remove =Remove +label.wiki.remove.toolTip =Remove this Wiki page label.wiki.remove.confirm =Delete entire Wiki page? This action cannot be undone. label.wiki.pages =Wiki Pages -label.wiki.main =(Main) label.wiki.savechanges =Save changes label.wiki.remove.confirm =Are you sure you want to delete this Wiki page? This action cannot be undone. -label.wiki.history =View Page History +label.wiki.history =History label.wiki.history.toolTip =View previous versions of this Wiki page label.wiki.history.version =Version label.wiki.history.empty =There are no previous versions of this Wiki page. @@ -146,5 +146,14 @@ monitor.notebooks =Notebook Reflections output.learner.number.of.edits =Number of page edits output.learner.number.of.add =Number of pages added +notify.pageEdited.subject =LAMS Wiki page has been edited for {0}. +notify.pageAdded.subject =LAMS Wiki page has been added for {0}. +notify.pageRemoved.subject =LAMS Wiki page has been removed for {0}. +notify.pageEdited.body =A Wiki page has been edited by {0} for {1}. To see the page, go to {2} +notify.pageAdded.body =A Wiki page has been added by {0} for {1}. To see the page, go to {2} +notify.pageRemoved.body =A Wiki page has been removed by {0} for {1}. To see the Wiki, go to {2} +notify.learner.subscribe =Subscribe +notify.learner.unsubscribe =Unsubscribe +notify.learner.query ={0} to notifications by email each time the Wiki is edited. #======= End labels: Exported 81 labels for en AU ===== Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/WikiPageAction.java =================================================================== diff -u -rf08d91b95c1892c71594dd4f7fd6e9b4509cccc7 -rff341c0d1e171ace0d2144ed148472745449c066 --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/WikiPageAction.java (.../WikiPageAction.java) (revision f08d91b95c1892c71594dd4f7fd6e9b4509cccc7) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/WikiPageAction.java (.../WikiPageAction.java) (revision ff341c0d1e171ace0d2144ed148472745449c066) @@ -197,6 +197,11 @@ // Updating the wikiPage, setting a null user which indicated this // change was made in author wikiService.updateWikiPage(wikiForm, currentPage, user); + + // Send revert notifications + if (toolSessionID != null && user != null) { + notifyWikiChange(toolSessionID, "notify.pageEdited.subject", "notify.pageEdited.body", user, request); + } return unspecified(mapping, wikiForm, request, response); } @@ -382,6 +387,11 @@ // inserting the wiki page, null user and session indicates that this // page was saved in author Long currentPageUid = wikiService.insertWikiPage(wikiForm, wiki, user, session); + + // Send adding page notifications + if (toolSessionID != null && user != null) { + notifyWikiChange(toolSessionID, "notify.pageAdded.subject", "notify.pageAdded.body", user, request); + } // go to the new wiki page return returnToWiki(mapping, wikiForm, request, response, currentPageUid); @@ -401,6 +411,10 @@ // The page to be removed Long currentPageUid = WebUtil.readLongParam(request, WikiConstants.ATTR_CURRENT_WIKI); + // Get the session information for notifications + Long toolSessionID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID, true); + WikiUser user = getCurrentUser(toolSessionID); + // set up wikiService if (wikiService == null) { wikiService = WikiServiceProxy.getWikiService(this.getServlet().getServletContext()); @@ -411,6 +425,11 @@ // Updating the wikiPage, setting a null user which indicated this // change was made in author wikiService.deleteWikiPage(wikiPage); + + // Send removed page notifications + if (toolSessionID != null && user != null) { + notifyWikiChange(toolSessionID, "notify.pageRemoved.subject", "notify.pageRemoved.body", user, request); + } // return to the main page, by setting the current page to null return this.returnToWiki(mapping, form, request, response, null);