Index: lams_tool_wiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wiki/model/WikiPage.hbm.xml
===================================================================
diff -u -r1082bdcc357c105126a5641cecc68acfa645b66b -ra765c868e65385168275af7a88c5391097ecdf35
--- lams_tool_wiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wiki/model/WikiPage.hbm.xml	(.../WikiPage.hbm.xml)	(revision 1082bdcc357c105126a5641cecc68acfa645b66b)
+++ lams_tool_wiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wiki/model/WikiPage.hbm.xml	(.../WikiPage.hbm.xml)	(revision a765c868e65385168275af7a88c5391097ecdf35)
@@ -90,6 +90,19 @@
         </many-to-one>
 
         <many-to-one
+            name="addedBy"
+            class="org.lamsfoundation.lams.tool.wiki.model.WikiUser"
+            cascade="none"
+            outer-join="auto"
+            update="true"
+            insert="true"
+        >
+            <column
+                name="added_by" 
+            />
+        </many-to-one>
+
+        <many-to-one
             name="wikiSession"
             class="org.lamsfoundation.lams.tool.wiki.model.WikiSession"
             cascade="none"
Index: lams_tool_wiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wiki/model/WikiSession.hbm.xml
===================================================================
diff -u -r1082bdcc357c105126a5641cecc68acfa645b66b -ra765c868e65385168275af7a88c5391097ecdf35
--- lams_tool_wiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wiki/model/WikiSession.hbm.xml	(.../WikiSession.hbm.xml)	(revision 1082bdcc357c105126a5641cecc68acfa645b66b)
+++ lams_tool_wiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wiki/model/WikiSession.hbm.xml	(.../WikiSession.hbm.xml)	(revision a765c868e65385168275af7a88c5391097ecdf35)
@@ -120,6 +120,28 @@
 
         </set>
 
+        <many-to-one
+            name="mainPage"
+            class="org.lamsfoundation.lams.tool.wiki.model.WikiPage"
+            cascade="none"
+            outer-join="auto"
+            update="true"
+            insert="true"
+        >
+            <column
+                name="wiki_main_page_uid" 
+            />
+        </many-to-one>
+
+        <property
+            name="contentFolderID"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="content_folder_id"
+            length="255"
+        />
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-WikiSession.xml
Index: lams_tool_wiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wiki/model/WikiUser.hbm.xml
===================================================================
diff -u -r1082bdcc357c105126a5641cecc68acfa645b66b -ra765c868e65385168275af7a88c5391097ecdf35
--- lams_tool_wiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wiki/model/WikiUser.hbm.xml	(.../WikiUser.hbm.xml)	(revision 1082bdcc357c105126a5641cecc68acfa645b66b)
+++ lams_tool_wiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wiki/model/WikiUser.hbm.xml	(.../WikiUser.hbm.xml)	(revision a765c868e65385168275af7a88c5391097ecdf35)
@@ -90,6 +90,14 @@
             column="entry_uid"
         />
 
+        <property
+            name="wikiEdits"
+            type="java.lang.Integer"
+            update="true"
+            insert="true"
+            column="wiki_edits"
+        />
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-WikiUser.xml
Index: lams_tool_wiki/conf/language/ApplicationResources.properties
===================================================================
diff -u -r1082bdcc357c105126a5641cecc68acfa645b66b -ra765c868e65385168275af7a88c5391097ecdf35
--- lams_tool_wiki/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 1082bdcc357c105126a5641cecc68acfa645b66b)
+++ lams_tool_wiki/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision a765c868e65385168275af7a88c5391097ecdf35)
@@ -1,30 +1,46 @@
-appName = notebook 
+appName = wiki 
 #language code: en 
 #locale code: AU 
 
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri Aug 11 07:11:53 GMT 2006 
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Wed Aug 27 01:17:00 BST 2008 
  
 #=================== labels for Notebook =================# 
 
-tool.display.name  =Notebook
-tool.description  =Notebook Tool
-activity.title  =Notebook
-activity.description  =Notebook Tool
-activity.helptext  =Notebook for notes and reflections
-pageTitle.authoring  =Notebook Authoring
+error.contentrepository  =An error has occurred when saving/deleting instruction file {0}. The files may not be saved correctly.
+button.instructions  =Instructions
+instructions.uploadOfflineInstr  =Offline Instructions File:
+instructions.uploadOnlineInstr  =Online Instructions File:
+instructions.offlineInstructions  =Offline Instructions:
+instructions.onlineInstructions  =Online Instructions:
+activity.helptext  =Wiki tool for creating wiki pages
+message.contentInUseSet  =Modification of content is not allowed since one or more students has attempted the activity.
+error.content.locked  =The content has been locked since it is being used by one or more learners. The modification of the content is not allowed.
+tool.display.name  =Wiki
+tool.description  =Wiki Tool
+activity.title  =Wiki
+activity.description  =Wiki Tool
+pageTitle.authoring  =Wiki Authoring
 button.basic  =Basic
 button.advanced  =Advanced
-button.instructions  =Instructions
 button.upload  =Upload
+button.continue  =Continue
+button.edit  =Edit
 label.authoring.basic.title  =Title:
 label.authoring.basic.content  =Content:
-label.authoring.basic.instructions  =Instructions:
+label.authoring.basic.wikipagevisible  =Make Wiki page editable
 advanced.lockOnFinished  =Lock when finished
-advanced.allowRichEditor  =Allow rich text editor
-instructions.onlineInstructions  =Online Instructions:
-instructions.offlineInstructions  =Offline Instructions:
-instructions.uploadOnlineInstr  =Online Instructions File:
-instructions.uploadOfflineInstr  =Offline Instructions File:
+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.reflectOnActivity  =Add Notebook at end of Wiki with the following instructions:
+message.no.reflection.available  =No notebook available
+advanced.editingLimits  =Editing Limits
+advanced.editingLimits.prompt  =Number of times a learner can edit a page
+advanced.editingLimits.minimum  =Minimum:
+advanced.editingLimits.maximum  =Maximum:
+advanced.editingLimits.nominimum  =No minimum
+advanced.editingLimits.nomaximum  =No maximum
+advanced.editingLimits.error  =Maximum edits must be larger or equal to minimum.
 instructions.type.online  =Online
 instructions.type.offline  =Offline
 label.filename  =Filename
@@ -35,51 +51,95 @@
 link.delete  =Delete
 message.updateSuccess  =Changes saved
 message.unsavedChanges  =Page contains unsaved changes
-pageTitle.learning  =Online Notebook
+pageTitle.learning  =Wiki
 message.defineLaterSet  =Please wait for the teacher to complete the contents of this activity
-message.runOfflineSet  =This activity is not being done on the computer. Please see your instructor for details
-pageTitle.monitoring  =Notebook Monitoring
+message.runOfflineSet  =This activity is not being done on the computer. Please see your instructor for details.
+pageTitle.monitoring  =Wiki Monitoring
 button.summary  =Summary
 button.editActivity  =Edit Activity
 button.statistics  =Statistics
 titleHeading.summary  =Summary
-titleHeading.instructions  =Instructions
 titleHeading.statistics  =Statistics
 titleHeading.editActivity  =Edit Activity
 titleHeading.exportPortfolio  =Export Portfolio
 heading.group  =Group {0}:
 heading.totalLearners  =Number of Learners:
 heading.totalLearnersInGroup  =Total Number of Learners in Group:
 heading.totalFinishedLearnersInGroup  =Number of Finished Learners:
-message.contentInUseSet  =The modification of content is not allowed since one or more students has attempted the activity.
 message.summary  =There is no summary available for this tool.
 label.view  =View
 label.notAvailable  =Not Available
 heading.learner  =Learner
 heading.notebookEntry  =Notebook Entry
 button.cancel  =Cancel
+button.close  =Close
 button.ok  =OK
 button.done  =Done
 button.save  =Save
-button.finish  =Finish
 button.next  =Next
-label.save  =Save
-label.cancel  =Cancel
 label.created  =Created
 label.lastModified  =Last modified
 label.notebookEntry  =Notebook entry
 error.missingParam  =Unable to continue. {0} is missing.
 error.exceedMaxFileSize  =File size exceeded
-error.exception.NbApplication  =An internal error has occured with the Notebook Tool. If reporting this error, please report: <br/> <b>{0}</b>
-error.contentrepository  =An error has occurred when saving/deleting instruction file {0}. The files may not be saved correctly.
-error.content.locked  =The content has been locked since it is being used by one or more learners. The modification of the content is not allowed.
+error.exception.NbApplication  =An internal error has occurred with the Wiki Tool. If reporting this error, please report: <br/> <b>{0}</b>
 error.defineLater  =Sorry, the activity is not ready yet. Please wait for the teacher to finishing defining the activity.
 errors.maxfilesize  =The uploaded file has exceeded the maximum file size limit of {0} bytes
 error.mandatoryField  ={0} field is mandatory.
 error.mark.invalid.number  ={0} field must be a valid number. Decimal points are not allowed.
 error.mark.invalid.decimal.number  ={0} field must be a valid decimal number.
 authoring.msg.cancel.save  =Do you want to close this window without saving?
 button.try.again  =Try Again
+message.learner.blank.input  =You have not written anything. Are you sure this is correct?
+button.finish  =Next Activity
+message.alertContentEdit  =Warning: One of more students have accessed this activity. Changing this content will result in students getting different information.
+message.warnLockOnFinish  =Note: After you click on "Next Activity" and you come back to this Wiki, you won't be able to continue editing.
+message.activityLocked  =The instructor has set this activity not to allow editing after you have finished it. As you are returning to this Wiki, you are able to see your Wiki but not allowed to edit it.
+message.minumumEditsNotReached  =Note: You have not yet reached the required number of edits, you must complete {0} edits before continuing to the next activity.
+message.warnMaxEdits  =Note: You are only allowed to do {0} more edits before this Wiki will be locked. After that you wont be able to continue editing.
+message.maxEditsReached  =You have reached the maximum number of edits for this Wiki activity so it has been locked.
+message.pageNotEditable  =This page has been set to locked by your instructor, so you cannot edit it.
+titleHeading.instructions  =Instructions
+label.authoring.basic.instructions  =Instructions:
+label.wiki.body  =Wiki Body
+label.wiki.edit  =Edit
+label.wiki.add  =Add
+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.remove  =Remove
+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.version  =Version
+label.wiki.history.empty  =There are no previous versions of this Wiki page.
+label.wiki.history.date  =Edit Date
+label.wiki.history.editor  =Edit By
+label.wiki.history.editor.author  =Author
+label.wiki.history.actions  =Actions
+label.wiki.history.actions.revert  =Revert
+label.wiki.history.actions.revert.tooltip  =Revert back to this version
+label.wiki.history.actions.compare  =Compare
+label.wiki.history.actions.view  =View
+label.wiki.history.actions.view.tooltip  =View page version
+label.wiki.history.actions.compare.tooltip  =Compare current version to this version
+label.wiki.compare  =Comparing versions {0}
+label.wiki.compare.added.line  =Added lines
+label.wiki.compare.removed.line  =Removed lines
+label.on  =On
+label.off  =Off
+monitor.summary.th.advancedSettings  =Advanced Settings
+monitor.th.sessions  =Wiki Sessions
+monitor.th.numlearners  =Number of Learners
+monitor.summary.td.addNotebook  =Add Notebook at end of Wiki
+monitor.summary.td.notebookInstructions  =Notebook instructions
+monitor.nosessions  =There are no sessions running yet for this Wiki.
+monitor.notebooks  =Notebook Reflections
+output.learner.number.of.edits  =Number of page edits
+output.learner.number.of.add  =Number of pages added
 
-
-#======= End labels: Exported 74 labels for en AU =====
+#======= End labels: Exported 81 labels for en AU =====
Index: lams_tool_wiki/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r1082bdcc357c105126a5641cecc68acfa645b66b -ra765c868e65385168275af7a88c5391097ecdf35
--- lams_tool_wiki/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 1082bdcc357c105126a5641cecc68acfa645b66b)
+++ lams_tool_wiki/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision a765c868e65385168275af7a88c5391097ecdf35)
@@ -1,4 +1,4 @@
-appName = notebook 
+appName = wiki 
 #language code: en 
 #locale code: AU 
 
@@ -12,21 +12,35 @@
 instructions.uploadOnlineInstr  =Online Instructions File:
 instructions.offlineInstructions  =Offline Instructions:
 instructions.onlineInstructions  =Online Instructions:
-activity.helptext  =Notebook for notes and reflections
+activity.helptext  =Wiki tool for creating wiki pages
 message.contentInUseSet  =Modification of content is not allowed since one or more students has attempted the activity.
 error.content.locked  =The content has been locked since it is being used by one or more learners. The modification of the content is not allowed.
-tool.display.name  =Notebook
-tool.description  =Notebook Tool
+tool.display.name  =Wiki
+tool.description  =Wiki Tool
 activity.title  =Wiki
-activity.description  =Notebook Tool
-pageTitle.authoring  =Notebook Authoring
+activity.description  =Wiki Tool
+pageTitle.authoring  =Wiki Authoring
 button.basic  =Basic
 button.advanced  =Advanced
 button.upload  =Upload
+button.continue  =Continue
+button.edit  =Edit
 label.authoring.basic.title  =Title:
 label.authoring.basic.content  =Content:
+label.authoring.basic.wikipagevisible  =Make Wiki page editable
 advanced.lockOnFinished  =Lock when finished
-advanced.allowRichEditor  =Allow rich text editor
+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.reflectOnActivity  =Add Notebook at end of Wiki with the following instructions:
+message.no.reflection.available  =No notebook available
+advanced.editingLimits  =Editing Limits
+advanced.editingLimits.prompt  =Number of times a learner can edit a page
+advanced.editingLimits.minimum  =Minimum:
+advanced.editingLimits.maximum  =Maximum:
+advanced.editingLimits.nominimum  =No minimum
+advanced.editingLimits.nomaximum  =No maximum
+advanced.editingLimits.error  =Maximum edits must be larger or equal to minimum.
 instructions.type.online  =Online
 instructions.type.offline  =Offline
 label.filename  =Filename
@@ -37,10 +51,10 @@
 link.delete  =Delete
 message.updateSuccess  =Changes saved
 message.unsavedChanges  =Page contains unsaved changes
-pageTitle.learning  =Online Notebook
+pageTitle.learning  =Wiki
 message.defineLaterSet  =Please wait for the teacher to complete the contents of this activity
 message.runOfflineSet  =This activity is not being done on the computer. Please see your instructor for details.
-pageTitle.monitoring  =Notebook Monitoring
+pageTitle.monitoring  =Wiki Monitoring
 button.summary  =Summary
 button.editActivity  =Edit Activity
 button.statistics  =Statistics
@@ -58,18 +72,17 @@
 heading.learner  =Learner
 heading.notebookEntry  =Notebook Entry
 button.cancel  =Cancel
+button.close  =Close
 button.ok  =OK
 button.done  =Done
 button.save  =Save
 button.next  =Next
-label.save  =Save
-label.cancel  =Cancel
 label.created  =Created
 label.lastModified  =Last modified
 label.notebookEntry  =Notebook entry
 error.missingParam  =Unable to continue. {0} is missing.
 error.exceedMaxFileSize  =File size exceeded
-error.exception.NbApplication  =An internal error has occured with the Notebook Tool. If reporting this error, please report: <br/> <b>{0}</b>
+error.exception.NbApplication  =An internal error has occurred with the Wiki Tool. If reporting this error, please report: <br/> <b>{0}</b>
 error.defineLater  =Sorry, the activity is not ready yet. Please wait for the teacher to finishing defining the activity.
 errors.maxfilesize  =The uploaded file has exceeded the maximum file size limit of {0} bytes
 error.mandatoryField  ={0} field is mandatory.
@@ -80,13 +93,53 @@
 message.learner.blank.input  =You have not written anything. Are you sure this is correct?
 button.finish  =Next Activity
 message.alertContentEdit  =Warning: One of more students have accessed this activity. Changing this content will result in students getting different information.
-message.warnLockOnFinish  =Note: After you click on "Next Activity" and you come back to this Notebook, you won't be able to continue adding notes.
-message.activityLocked  =The instructor has set this activity not to allow notes after you have finished it. As you are returning to this Notebook, you are able to see your notes but not allowed to add more.
+message.warnLockOnFinish  =Note: After you click on "Next Activity" and you come back to this Wiki, you won't be able to continue editing.
+message.activityLocked  =The instructor has set this activity not to allow editing after you have finished it. As you are returning to this Wiki, you are able to see your Wiki but not allowed to edit it.
+message.minumumEditsNotReached  =Note: You have not yet reached the required number of edits, you must complete {0} edits before continuing to the next activity.
+message.warnMaxEdits  =Note: You are only allowed to do {0} more edits before this Wiki will be locked. After that you wont be able to continue editing.
+message.maxEditsReached  =You have reached the maximum number of edits for this Wiki activity so it has been locked.
+message.pageNotEditable  =This page has been set to locked by your instructor, so you cannot edit it.
 titleHeading.instructions  =Instructions
 label.authoring.basic.instructions  =Instructions:
+label.wiki.body  =Wiki Body
+label.wiki.edit  =Edit
+label.wiki.add  =Add
+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.remove  =Remove
+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.version  =Version
+label.wiki.history.empty  =There are no previous versions of this Wiki page.
+label.wiki.history.date  =Edit Date
+label.wiki.history.editor  =Edit By
+label.wiki.history.editor.author  =Author
+label.wiki.history.actions  =Actions
+label.wiki.history.actions.revert  =Revert
+label.wiki.history.actions.revert.tooltip  =Revert back to this version
+label.wiki.history.actions.compare  =Compare
+label.wiki.history.actions.view  =View
+label.wiki.history.actions.view.tooltip  =View page version
+label.wiki.history.actions.compare.tooltip  =Compare current version to this version
+label.wiki.compare  =Comparing versions {0}
+label.wiki.compare.added.line  =Added lines
+label.wiki.compare.removed.line  =Removed lines
 label.on  =On
 label.off  =Off
 monitor.summary.th.advancedSettings  =Advanced Settings
+monitor.th.sessions  =Wiki Sessions
+monitor.th.numlearners  =Number of Learners
+monitor.summary.td.addNotebook  =Add Notebook at end of Wiki
+monitor.summary.td.notebookInstructions  =Notebook instructions
+monitor.nosessions  =There are no sessions running yet for this Wiki.
+monitor.notebooks  =Notebook Reflections
+output.learner.number.of.edits  =Number of page edits
+output.learner.number.of.add  =Number of pages added
 
-
 #======= End labels: Exported 81 labels for en AU =====
Index: lams_tool_wiki/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r1082bdcc357c105126a5641cecc68acfa645b66b -ra765c868e65385168275af7a88c5391097ecdf35
--- lams_tool_wiki/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 1082bdcc357c105126a5641cecc68acfa645b66b)
+++ lams_tool_wiki/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision a765c868e65385168275af7a88c5391097ecdf35)
@@ -1,4 +1,4 @@
-appName = notebook 
+appName = wiki 
 #language code: en 
 #locale code: AU 
 
@@ -12,21 +12,35 @@
 instructions.uploadOnlineInstr  =Online Instructions File:
 instructions.offlineInstructions  =Offline Instructions:
 instructions.onlineInstructions  =Online Instructions:
-activity.helptext  =Notebook for notes and reflections
+activity.helptext  =Wiki tool for creating wiki pages
 message.contentInUseSet  =Modification of content is not allowed since one or more students has attempted the activity.
 error.content.locked  =The content has been locked since it is being used by one or more learners. The modification of the content is not allowed.
-tool.display.name  =Notebook
-tool.description  =Notebook Tool
+tool.display.name  =Wiki
+tool.description  =Wiki Tool
 activity.title  =Wiki
-activity.description  =Notebook Tool
-pageTitle.authoring  =Notebook Authoring
+activity.description  =Wiki Tool
+pageTitle.authoring  =Wiki Authoring
 button.basic  =Basic
 button.advanced  =Advanced
 button.upload  =Upload
+button.continue  =Continue
+button.edit  =Edit
 label.authoring.basic.title  =Title:
 label.authoring.basic.content  =Content:
+label.authoring.basic.wikipagevisible  =Make Wiki page editable
 advanced.lockOnFinished  =Lock when finished
-advanced.allowRichEditor  =Allow rich text editor
+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.reflectOnActivity  =Add Notebook at end of Wiki with the following instructions:
+message.no.reflection.available  =No notebook available
+advanced.editingLimits  =Editing Limits
+advanced.editingLimits.prompt  =Number of times a learner can edit a page
+advanced.editingLimits.minimum  =Minimum:
+advanced.editingLimits.maximum  =Maximum:
+advanced.editingLimits.nominimum  =No minimum
+advanced.editingLimits.nomaximum  =No maximum
+advanced.editingLimits.error  =Maximum edits must be larger or equal to minimum.
 instructions.type.online  =Online
 instructions.type.offline  =Offline
 label.filename  =Filename
@@ -37,10 +51,10 @@
 link.delete  =Delete
 message.updateSuccess  =Changes saved
 message.unsavedChanges  =Page contains unsaved changes
-pageTitle.learning  =Online Notebook
+pageTitle.learning  =Wiki
 message.defineLaterSet  =Please wait for the teacher to complete the contents of this activity
 message.runOfflineSet  =This activity is not being done on the computer. Please see your instructor for details.
-pageTitle.monitoring  =Notebook Monitoring
+pageTitle.monitoring  =Wiki Monitoring
 button.summary  =Summary
 button.editActivity  =Edit Activity
 button.statistics  =Statistics
@@ -58,18 +72,17 @@
 heading.learner  =Learner
 heading.notebookEntry  =Notebook Entry
 button.cancel  =Cancel
+button.close  =Close
 button.ok  =OK
 button.done  =Done
 button.save  =Save
 button.next  =Next
-label.save  =Save
-label.cancel  =Cancel
 label.created  =Created
 label.lastModified  =Last modified
 label.notebookEntry  =Notebook entry
 error.missingParam  =Unable to continue. {0} is missing.
 error.exceedMaxFileSize  =File size exceeded
-error.exception.NbApplication  =An internal error has occured with the Notebook Tool. If reporting this error, please report: <br/> <b>{0}</b>
+error.exception.NbApplication  =An internal error has occurred with the Wiki Tool. If reporting this error, please report: <br/> <b>{0}</b>
 error.defineLater  =Sorry, the activity is not ready yet. Please wait for the teacher to finishing defining the activity.
 errors.maxfilesize  =The uploaded file has exceeded the maximum file size limit of {0} bytes
 error.mandatoryField  ={0} field is mandatory.
@@ -80,20 +93,53 @@
 message.learner.blank.input  =You have not written anything. Are you sure this is correct?
 button.finish  =Next Activity
 message.alertContentEdit  =Warning: One of more students have accessed this activity. Changing this content will result in students getting different information.
-message.warnLockOnFinish  =Note: After you click on "Next Activity" and you come back to this Notebook, you won't be able to continue adding notes.
-message.activityLocked  =The instructor has set this activity not to allow notes after you have finished it. As you are returning to this Notebook, you are able to see your notes but not allowed to add more.
+message.warnLockOnFinish  =Note: After you click on "Next Activity" and you come back to this Wiki, you won't be able to continue editing.
+message.activityLocked  =The instructor has set this activity not to allow editing after you have finished it. As you are returning to this Wiki, you are able to see your Wiki but not allowed to edit it.
+message.minumumEditsNotReached  =Note: You have not yet reached the required number of edits, you must complete {0} edits before continuing to the next activity.
+message.warnMaxEdits  =Note: You are only allowed to do {0} more edits before this Wiki will be locked. After that you wont be able to continue editing.
+message.maxEditsReached  =You have reached the maximum number of edits for this Wiki activity so it has been locked.
+message.pageNotEditable  =This page has been set to locked by your instructor, so you cannot edit it.
 titleHeading.instructions  =Instructions
 label.authoring.basic.instructions  =Instructions:
 label.wiki.body  =Wiki Body
-label.wiki.edit  =Edit Page
-label.wiki.add  =Add Page
-label.wiki.history  =View History
+label.wiki.edit  =Edit
+label.wiki.add  =Add
+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.remove  =Remove
+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.version  =Version
+label.wiki.history.empty  =There are no previous versions of this Wiki page.
+label.wiki.history.date  =Edit Date
+label.wiki.history.editor  =Edit By
+label.wiki.history.editor.author  =Author
+label.wiki.history.actions  =Actions
+label.wiki.history.actions.revert  =Revert
+label.wiki.history.actions.revert.tooltip  =Revert back to this version
+label.wiki.history.actions.compare  =Compare
+label.wiki.history.actions.view  =View
+label.wiki.history.actions.view.tooltip  =View page version
+label.wiki.history.actions.compare.tooltip  =Compare current version to this version
+label.wiki.compare  =Comparing versions {0}
+label.wiki.compare.added.line  =Added lines
+label.wiki.compare.removed.line  =Removed lines
 label.on  =On
 label.off  =Off
 monitor.summary.th.advancedSettings  =Advanced Settings
+monitor.th.sessions  =Wiki Sessions
+monitor.th.numlearners  =Number of Learners
+monitor.summary.td.addNotebook  =Add Notebook at end of Wiki
+monitor.summary.td.notebookInstructions  =Notebook instructions
+monitor.nosessions  =There are no sessions running yet for this Wiki.
+monitor.notebooks  =Notebook Reflections
+output.learner.number.of.edits  =Number of page edits
+output.learner.number.of.add  =Number of pages added
 
-
 #======= End labels: Exported 81 labels for en AU =====
Index: lams_tool_wiki/conf/language/rams/ApplicationResources.properties
===================================================================
diff -u -r1082bdcc357c105126a5641cecc68acfa645b66b -ra765c868e65385168275af7a88c5391097ecdf35
--- lams_tool_wiki/conf/language/rams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 1082bdcc357c105126a5641cecc68acfa645b66b)
+++ lams_tool_wiki/conf/language/rams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision a765c868e65385168275af7a88c5391097ecdf35)
@@ -1,4 +1,4 @@
-appName = notebook 
+appName = wiki 
 #language code: en 
 #locale code: AU 
 
@@ -12,21 +12,35 @@
 instructions.uploadOnlineInstr  =Online Instructions File:
 instructions.offlineInstructions  =Offline Instructions:
 instructions.onlineInstructions  =Online Instructions:
-activity.helptext  =Notebook for notes and reflections
+activity.helptext  =Wiki tool for creating wiki pages
 message.contentInUseSet  =Modification of content is not allowed since one or more students has attempted the activity.
 error.content.locked  =The content has been locked since it is being used by one or more learners. The modification of the content is not allowed.
-tool.display.name  =Notebook
-tool.description  =Notebook Tool
+tool.display.name  =Wiki
+tool.description  =Wiki Tool
 activity.title  =Wiki
-activity.description  =Notebook Tool
-pageTitle.authoring  =Notebook Authoring
+activity.description  =Wiki Tool
+pageTitle.authoring  =Wiki Authoring
 button.basic  =Basic
 button.advanced  =Advanced
 button.upload  =Upload
+button.continue  =Continue
+button.edit  =Edit
 label.authoring.basic.title  =Title:
 label.authoring.basic.content  =Content:
+label.authoring.basic.wikipagevisible  =Make Wiki page editable
 advanced.lockOnFinished  =Lock when finished
-advanced.allowRichEditor  =Allow rich text editor
+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.reflectOnActivity  =Add Notebook at end of Wiki with the following instructions:
+message.no.reflection.available  =No notebook available
+advanced.editingLimits  =Editing Limits
+advanced.editingLimits.prompt  =Number of times a learner can edit a page
+advanced.editingLimits.minimum  =Minimum:
+advanced.editingLimits.maximum  =Maximum:
+advanced.editingLimits.nominimum  =No minimum
+advanced.editingLimits.nomaximum  =No maximum
+advanced.editingLimits.error  =Maximum edits must be larger or equal to minimum.
 instructions.type.online  =Online
 instructions.type.offline  =Offline
 label.filename  =Filename
@@ -37,10 +51,10 @@
 link.delete  =Delete
 message.updateSuccess  =Changes saved
 message.unsavedChanges  =Page contains unsaved changes
-pageTitle.learning  =Online Notebook
+pageTitle.learning  =Wiki
 message.defineLaterSet  =Please wait for the teacher to complete the contents of this activity
 message.runOfflineSet  =This activity is not being done on the computer. Please see your instructor for details.
-pageTitle.monitoring  =Notebook Monitoring
+pageTitle.monitoring  =Wiki Monitoring
 button.summary  =Summary
 button.editActivity  =Edit Activity
 button.statistics  =Statistics
@@ -58,18 +72,17 @@
 heading.learner  =Learner
 heading.notebookEntry  =Notebook Entry
 button.cancel  =Cancel
+button.close  =Close
 button.ok  =OK
 button.done  =Done
 button.save  =Save
 button.next  =Next
-label.save  =Save
-label.cancel  =Cancel
 label.created  =Created
 label.lastModified  =Last modified
 label.notebookEntry  =Notebook entry
 error.missingParam  =Unable to continue. {0} is missing.
 error.exceedMaxFileSize  =File size exceeded
-error.exception.NbApplication  =An internal error has occured with the Notebook Tool. If reporting this error, please report: <br/> <b>{0}</b>
+error.exception.NbApplication  =An internal error has occurred with the Wiki Tool. If reporting this error, please report: <br/> <b>{0}</b>
 error.defineLater  =Sorry, the activity is not ready yet. Please wait for the teacher to finishing defining the activity.
 errors.maxfilesize  =The uploaded file has exceeded the maximum file size limit of {0} bytes
 error.mandatoryField  ={0} field is mandatory.
@@ -80,13 +93,53 @@
 message.learner.blank.input  =You have not written anything. Are you sure this is correct?
 button.finish  =Next Activity
 message.alertContentEdit  =Warning: One of more students have accessed this activity. Changing this content will result in students getting different information.
-message.warnLockOnFinish  =Note: After you click on "Next Activity" and you come back to this Notebook, you won't be able to continue adding notes.
-message.activityLocked  =The instructor has set this activity not to allow notes after you have finished it. As you are returning to this Notebook, you are able to see your notes but not allowed to add more.
+message.warnLockOnFinish  =Note: After you click on "Next Activity" and you come back to this Wiki, you won't be able to continue editing.
+message.activityLocked  =The instructor has set this activity not to allow editing after you have finished it. As you are returning to this Wiki, you are able to see your Wiki but not allowed to edit it.
+message.minumumEditsNotReached  =Note: You have not yet reached the required number of edits, you must complete {0} edits before continuing to the next activity.
+message.warnMaxEdits  =Note: You are only allowed to do {0} more edits before this Wiki will be locked. After that you wont be able to continue editing.
+message.maxEditsReached  =You have reached the maximum number of edits for this Wiki activity so it has been locked.
+message.pageNotEditable  =This page has been set to locked by your instructor, so you cannot edit it.
 titleHeading.instructions  =Instructions
 label.authoring.basic.instructions  =Instructions:
+label.wiki.body  =Wiki Body
+label.wiki.edit  =Edit
+label.wiki.add  =Add
+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.remove  =Remove
+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.version  =Version
+label.wiki.history.empty  =There are no previous versions of this Wiki page.
+label.wiki.history.date  =Edit Date
+label.wiki.history.editor  =Edit By
+label.wiki.history.editor.author  =Author
+label.wiki.history.actions  =Actions
+label.wiki.history.actions.revert  =Revert
+label.wiki.history.actions.revert.tooltip  =Revert back to this version
+label.wiki.history.actions.compare  =Compare
+label.wiki.history.actions.view  =View
+label.wiki.history.actions.view.tooltip  =View page version
+label.wiki.history.actions.compare.tooltip  =Compare current version to this version
+label.wiki.compare  =Comparing versions {0}
+label.wiki.compare.added.line  =Added lines
+label.wiki.compare.removed.line  =Removed lines
 label.on  =On
 label.off  =Off
 monitor.summary.th.advancedSettings  =Advanced Settings
+monitor.th.sessions  =Wiki Sessions
+monitor.th.numlearners  =Number of Learners
+monitor.summary.td.addNotebook  =Add Notebook at end of Wiki
+monitor.summary.td.notebookInstructions  =Notebook instructions
+monitor.nosessions  =There are no sessions running yet for this Wiki.
+monitor.notebooks  =Notebook Reflections
+output.learner.number.of.edits  =Number of page edits
+output.learner.number.of.add  =Number of pages added
 
-
 #======= End labels: Exported 81 labels for en AU =====
Index: lams_tool_wiki/conf/language/rams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r98272e08314f1487800201921390914652849147 -ra765c868e65385168275af7a88c5391097ecdf35
--- lams_tool_wiki/conf/language/rams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 98272e08314f1487800201921390914652849147)
+++ lams_tool_wiki/conf/language/rams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision a765c868e65385168275af7a88c5391097ecdf35)
@@ -77,8 +77,6 @@
 button.done  =Done
 button.save  =Save
 button.next  =Next
-label.save  =Save
-label.cancel  =Cancel
 label.created  =Created
 label.lastModified  =Last modified
 label.notebookEntry  =Notebook entry
Index: lams_tool_wiki/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -r1082bdcc357c105126a5641cecc68acfa645b66b -ra765c868e65385168275af7a88c5391097ecdf35
--- lams_tool_wiki/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 1082bdcc357c105126a5641cecc68acfa645b66b)
+++ lams_tool_wiki/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision a765c868e65385168275af7a88c5391097ecdf35)
@@ -75,6 +75,11 @@
         path="tiles:/learning/defineLater"
         redirect="false"
       />
+      <forward
+        name="notebook"
+        path="tiles:/learning/notebook"
+        redirect="false"
+      />
     </action>
     <action
       path="/monitoring"
@@ -95,6 +100,16 @@
         path="tiles:/monitoring/wiki_display"
         redirect="false"
       />
+      <forward
+        name="compareWiki"
+        path="/pages/wiki/compare.jsp"
+        redirect="false"
+      />
+      <forward
+        name="viewWiki"
+        path="/pages/wiki/viewWiki.jsp"
+        redirect="false"
+      />
     </action>
     <action
       path="/clearsession"