Index: lams_tool_wiki_orig/conf/language/lams/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki_orig/conf/language/lams/ApplicationResources.properties,v diff -u -r1.3 -r1.4 --- lams_tool_wiki_orig/conf/language/lams/ApplicationResources.properties 2 Apr 2008 02:51:17 -0000 1.3 +++ lams_tool_wiki_orig/conf/language/lams/ApplicationResources.properties 2 Apr 2008 23:20:26 -0000 1.4 @@ -1,21 +1,21 @@ -appName = forum +appName = wiki #language code: en #locale code: AU # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri Mar 07 07:06:09 GMT 2008 -#=================== labels for Forum =================# +#=================== labels for Wiki =================# activity.title =Wiki -activity.description =Online threaded discussion tool (asynchronous). -activity.helptext =Discussion tool useful for long running collaborations and situations where learners are not all on line at the same time. -tool.display.name =Forum Tool -tool.description =Tool for forums, also known as message boards. -label.authoring.heading.basic =Forum -label.authoring.heading.basic.desc =Basic input information for forum +activity.description =Tool for creation and editing of wiki pages. +activity.helptext =Wiki tool useful for the creation, editing and linking of web content. +tool.display.name =Wiki Tool +tool.description =Tool for wiki pages. +label.authoring.heading.basic =Wiki +label.authoring.heading.basic.desc =Basic input information for wiki label.authoring.heading.instructions.desc =Please input online and offline instructions -label.authoring.heading.advance.desc =Please input advance options for Forum -label.authoring.create.new.topic =Create a new topic +label.authoring.heading.advance.desc =Please input advance options for Wiki +label.authoring.create.new.wiki =Create a new wiki page label.authoring.basic.title =Title label.authoring.online.instruction =Online Instructions label.authoring.offline.instruction =Offline Instructions @@ -30,16 +30,16 @@ label.authoring.offline.filelist =Offline file list label.authoring.online.delete =Delete label.authoring.offline.delete =Delete -lable.topic.title.subject =Subject -lable.topic.title.body =Body -lable.topic.title.update =Last post -lable.topic.title.author =Author -lable.topic.title.replies =Replies -lable.topic.title.mark =Mark -lable.topic.subject.by =By -lable.topic.title.message.number =# of Msg -lable.topic.title.average.mark =Aver mark -authoring.exception =There is a problem in forum authoring page, the reason is {0} +label.topic.title.wiki =Wiki Title +label.topic.title.pageContent =Page content +label.topic.title.update =Last update +label.topic.title.author =Author +label.topic.title.replies =Replies +label.topic.title.mark =Mark +label.topic.wiki.by =By +label.topic.title.message.number =# of Msg +label.topic.title.average.mark =Aver mark +authoring.exception =There is a problem in wiki authoring page, the reason is {0} page.title.monitoring.content.userlist =Summary page.title.monitoring.view.user.mark =View user mark page.title.monitoring.edit.user.mark =Edit user mark @@ -48,21 +48,21 @@ page.title.monitoring.view.instructions =View Instructions page.title.monitoring.view.topic =View topic page.title.monitoring.statistic =Statistic -page.title.monitoring.definelater =Forum Tool Define +page.title.monitoring.definelater =Wiki Tool Define label.monitoring.edit.activity.cancel =Cancel label.monitoring.edit.activity.update =Update label.monitoring.edit.activity.edit =Edit label.monitoring.statistic.average.mark =Average message mark -lable.monitoring.statistic.total.message =# of total message +label.monitoring.statistic.total.message =# of total message message.monitoring.edit.activity.not.editable =This Activity is no longer editable errors.header = errors.footer = error.valueReqd =Value Required error.inputFileTooLarge =Input File size is too large! error.mark.needNumber =Mark must be int value error.mark.invalid.number =Mark is invalid number format -error.fail.get.forum =No Forum available -error.title.empty =Title can not be blank +error.fail.get.wiki =No Wiki available +error.title.empty =Wiki title can not be blank message.msg.maxFileSize =Max 250K title.messageTopic.open =Topic Details title.message.add =Add Message @@ -72,8 +72,8 @@ title.message.view =Message Board title.message.view.topic =View Message title.message.delete =Delete Message -message.label.subject =Subject -message.label.body =Body +message.label.wikiTitle =Wiki Title +message.label.pageContent =Page content message.label.attachment =Attachment message.label.postedOn =Posted On: message.label.threadReplies =Thread Replies @@ -85,9 +85,9 @@ label.edit =Edit label.reply =Reply label.done =Done -label.newtopic =New Topic +label.newwiki =New Wiki label.refresh =Refresh -lable.char.left =Characters left +label.char.left =Characters left label.basic =Basic label.advanced =Advanced label.instructions =Instructions @@ -105,41 +105,41 @@ monitoring.tab.instructions =Instruction monitoring.tab.edit.activity =Edit Activity monitoring.user.post.topic =provides following posts: -lable.topic.title.comment =Comment +label.topic.title.comment =Comment message.not.avaliable =Not Available -lable.update.mark =Update mark +label.update.mark =Update mark message.assign.mark =Please assign a mark and a comment for the report by message.session.name =Session Name message.monitoring.summary.no.users =No users available message.view.all.marks =View all marks message.download.marks =Download marks -label.monitoring.summary.view.forum =View forum +label.monitoring.summary.view.wiki =View wiki message.monitoring.summary.no.session =No Session Available -topic.message.subject.hidden =Message subject hidden -topic.message.body.hidden =Message body hidden +topic.message.wikiTitle.hidden =Wiki title hidden +topic.message.pageContent.hidden =Page content hidden label.show =Show label.hide =Hide -page.title.monitoring.init =Forum Monitoring +page.title.monitoring.init =Wiki Monitoring monitoring.tab.statistics =Statistics label.save =Save label.cancel =Cancel authoring.tab.basic =Basic authoring.tab.advanced =Advanced authoring.tab.instructions =Instructions -page.title.authoring.init =Forum Authoring +page.title.authoring.init =Wiki Authoring define.later.message =Please wait for the teacher to complete the contents of this activity. run.offline.message =This activity is not being done on the computer. Please see your instructor for details. button.try.again =Try again authoring.msg.cancel.save =Do you want to close this window without saving? label.authoring.advance.lock.on.finished =Lock when finished -lable.topic.title.startedby =Started by -advanced.reflectOnActivity =Add Notebook at end of forum with the following instructions: +label.topic.title.createdby =Created by +advanced.reflectOnActivity =Add Notebook at end of wiki with the following instructions: label.authoring.advance.allow.upload =Allow learners to add attachments -error.body.required =Body can not be blank. -error.subject.required =Subject can not be blank. +error.pageContent.required =Page content cannot be blank. +error.wikiTitle.required =Wiki title can not be blank. label.default.user.name =Instructor button.close =Close -label.back.to.forum =Go back to forum +label.back.to.wiki =Go back to wiki label.authoring.advance.limited.input =Maximum number of characters per posting label.authoring.basic.instruction =Instructions label.authoring.advance.allow.edit =Allow learners to change their own postings @@ -166,7 +166,7 @@ monitoring.user.loginname =Login name page.title.monitoring.view.reflection =View Reflection title.original.message.reply =Original Message -output.desc.learner.number.of.posts =Learner''s number of postings in the forum +output.desc.learner.number.of.posts =Learner''s number of postings in the wiki label.finish =Next Activity Index: lams_tool_wiki_orig/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki_orig/conf/language/lams/ApplicationResources_en_AU.properties,v diff -u -r1.3 -r1.4 --- lams_tool_wiki_orig/conf/language/lams/ApplicationResources_en_AU.properties 2 Apr 2008 02:51:17 -0000 1.3 +++ lams_tool_wiki_orig/conf/language/lams/ApplicationResources_en_AU.properties 2 Apr 2008 23:20:26 -0000 1.4 @@ -1,21 +1,21 @@ -appName = forum +appName = wiki #language code: en #locale code: AU # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri Mar 07 07:06:09 GMT 2008 -#=================== labels for Forum =================# +#=================== labels for Wiki =================# activity.title =Wiki -activity.description =Online threaded discussion tool (asynchronous). -activity.helptext =Discussion tool useful for long running collaborations and situations where learners are not all on line at the same time. -tool.display.name =Forum Tool -tool.description =Tool for forums, also known as message boards. -label.authoring.heading.basic =Forum -label.authoring.heading.basic.desc =Basic input information for forum +activity.description =Tool for creation and editing of wiki pages. +activity.helptext =Wiki tool useful for the creation, editing and linking of web content. +tool.display.name =Wiki Tool +tool.description =Tool for wiki pages. +label.authoring.heading.basic =Wiki +label.authoring.heading.basic.desc =Basic input information for wiki label.authoring.heading.instructions.desc =Please input online and offline instructions -label.authoring.heading.advance.desc =Please input advance options for Forum -label.authoring.create.new.topic =Create a new topic +label.authoring.heading.advance.desc =Please input advance options for Wiki +label.authoring.create.new.wiki =Create a new wiki page label.authoring.basic.title =Title label.authoring.online.instruction =Online Instructions label.authoring.offline.instruction =Offline Instructions @@ -30,16 +30,16 @@ label.authoring.offline.filelist =Offline file list label.authoring.online.delete =Delete label.authoring.offline.delete =Delete -lable.topic.title.subject =Subject -lable.topic.title.body =Body -lable.topic.title.update =Last post -lable.topic.title.author =Author -lable.topic.title.replies =Replies -lable.topic.title.mark =Mark -lable.topic.subject.by =By -lable.topic.title.message.number =# of Msg -lable.topic.title.average.mark =Aver mark -authoring.exception =There is a problem in forum authoring page, the reason is {0} +label.topic.title.wiki =Wiki Title +label.topic.title.pageContent =Page content +label.topic.title.update =Last update +label.topic.title.author =Author +label.topic.title.replies =Replies +label.topic.title.mark =Mark +label.topic.wiki.by =By +label.topic.title.message.number =# of Msg +label.topic.title.average.mark =Aver mark +authoring.exception =There is a problem in wiki authoring page, the reason is {0} page.title.monitoring.content.userlist =Summary page.title.monitoring.view.user.mark =View user mark page.title.monitoring.edit.user.mark =Edit user mark @@ -48,21 +48,21 @@ page.title.monitoring.view.instructions =View Instructions page.title.monitoring.view.topic =View topic page.title.monitoring.statistic =Statistic -page.title.monitoring.definelater =Forum Tool Define +page.title.monitoring.definelater =Wiki Tool Define label.monitoring.edit.activity.cancel =Cancel label.monitoring.edit.activity.update =Update label.monitoring.edit.activity.edit =Edit label.monitoring.statistic.average.mark =Average message mark -lable.monitoring.statistic.total.message =# of total message +label.monitoring.statistic.total.message =# of total message message.monitoring.edit.activity.not.editable =This Activity is no longer editable errors.header = errors.footer = error.valueReqd =Value Required error.inputFileTooLarge =Input File size is too large! error.mark.needNumber =Mark must be int value error.mark.invalid.number =Mark is invalid number format -error.fail.get.forum =No Forum available -error.title.empty =Title can not be blank +error.fail.get.wiki =No Wiki available +error.title.empty =Wiki title can not be blank message.msg.maxFileSize =Max 250K title.messageTopic.open =Topic Details title.message.add =Add Message @@ -72,8 +72,8 @@ title.message.view =Message Board title.message.view.topic =View Message title.message.delete =Delete Message -message.label.subject =Subject -message.label.body =Body +message.label.wikiTitle =Wiki Title +message.label.pageContent =Page content message.label.attachment =Attachment message.label.postedOn =Posted On: message.label.threadReplies =Thread Replies @@ -85,9 +85,9 @@ label.edit =Edit label.reply =Reply label.done =Done -label.newtopic =New Topic +label.newwiki =New Wiki label.refresh =Refresh -lable.char.left =Characters left +label.char.left =Characters left label.basic =Basic label.advanced =Advanced label.instructions =Instructions @@ -105,41 +105,41 @@ monitoring.tab.instructions =Instruction monitoring.tab.edit.activity =Edit Activity monitoring.user.post.topic =provides following posts: -lable.topic.title.comment =Comment +label.topic.title.comment =Comment message.not.avaliable =Not Available -lable.update.mark =Update mark +label.update.mark =Update mark message.assign.mark =Please assign a mark and a comment for the report by message.session.name =Session Name message.monitoring.summary.no.users =No users available message.view.all.marks =View all marks message.download.marks =Download marks -label.monitoring.summary.view.forum =View forum +label.monitoring.summary.view.wiki =View wiki message.monitoring.summary.no.session =No Session Available -topic.message.subject.hidden =Message subject hidden -topic.message.body.hidden =Message body hidden +topic.message.wikiTitle.hidden =Wiki title hidden +topic.message.pageContent.hidden =Page content hidden label.show =Show label.hide =Hide -page.title.monitoring.init =Forum Monitoring +page.title.monitoring.init =Wiki Monitoring monitoring.tab.statistics =Statistics label.save =Save label.cancel =Cancel authoring.tab.basic =Basic authoring.tab.advanced =Advanced authoring.tab.instructions =Instructions -page.title.authoring.init =Forum Authoring +page.title.authoring.init =Wiki Authoring define.later.message =Please wait for the teacher to complete the contents of this activity. run.offline.message =This activity is not being done on the computer. Please see your instructor for details. button.try.again =Try again authoring.msg.cancel.save =Do you want to close this window without saving? label.authoring.advance.lock.on.finished =Lock when finished -lable.topic.title.startedby =Started by -advanced.reflectOnActivity =Add Notebook at end of forum with the following instructions: +label.topic.title.createdby =Created by +advanced.reflectOnActivity =Add Notebook at end of wiki with the following instructions: label.authoring.advance.allow.upload =Allow learners to add attachments -error.body.required =Body can not be blank. -error.subject.required =Subject can not be blank. +error.pageContent.required =Page content cannot be blank. +error.wikiTitle.required =Wiki title can not be blank. label.default.user.name =Instructor button.close =Close -label.back.to.forum =Go back to forum +label.back.to.wiki =Go back to wiki label.authoring.advance.limited.input =Maximum number of characters per posting label.authoring.basic.instruction =Instructions label.authoring.advance.allow.edit =Allow learners to change their own postings @@ -166,7 +166,7 @@ monitoring.user.loginname =Login name page.title.monitoring.view.reflection =View Reflection title.original.message.reply =Original Message -output.desc.learner.number.of.posts =Learner''s number of postings in the forum +output.desc.learner.number.of.posts =Learner''s number of postings in the wiki label.finish =Next Activity Index: lams_tool_wiki_orig/conf/xdoclet/validation-forms.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki_orig/conf/xdoclet/validation-forms.xml,v diff -u -r1.1 -r1.2 --- lams_tool_wiki_orig/conf/xdoclet/validation-forms.xml 2 Apr 2008 02:51:17 -0000 1.1 +++ lams_tool_wiki_orig/conf/xdoclet/validation-forms.xml 2 Apr 2008 23:20:26 -0000 1.2 @@ -12,15 +12,15 @@
Index: lams_tool_wiki_orig/db/sql/create_lams_tool_wiki.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki_orig/db/sql/create_lams_tool_wiki.sql,v diff -u -r1.3 -r1.4 --- lams_tool_wiki_orig/db/sql/create_lams_tool_wiki.sql 2 Apr 2008 02:51:18 -0000 1.3 +++ lams_tool_wiki_orig/db/sql/create_lams_tool_wiki.sql 2 Apr 2008 23:20:25 -0000 1.4 @@ -123,6 +123,6 @@ VALUES(1,"Wiki","Instructions",null,null,${default_content_id},0,0,0,0,0,1,0,1,0,1,0,1,5000,0); INSERT INTO `tl_lawiki10_message` (`uid`, `create_date`, `last_reply_date`, `update_date`, `create_by`, `modified_by`, `subject`, `body`, `is_authored`, `is_anonymous`, `wiki_session_uid`, `parent_uid`, `wiki_uid`, `reply_number`, `hide_flag`, `report_id`) VALUES - (1,NOW(),NOW(),NOW(),null,null,'Topic Heading','Topic message',1,0,NULL,NULL,1,0,0,NULL); + (1,NOW(),NOW(),NOW(),null,null,'Wiki Page','Wiki content',1,0,NULL,NULL,1,0,0,NULL); SET FOREIGN_KEY_CHECKS=1; Index: lams_tool_wiki_orig/src/java/org/lams/lams/tool/wiki/web/actions/MonitoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki_orig/src/java/org/lams/lams/tool/wiki/web/actions/Attic/MonitoringAction.java,v diff -u -r1.1 -r1.2 --- lams_tool_wiki_orig/src/java/org/lams/lams/tool/wiki/web/actions/MonitoringAction.java 2 Apr 2008 02:51:18 -0000 1.1 +++ lams_tool_wiki_orig/src/java/org/lams/lams/tool/wiki/web/actions/MonitoringAction.java 2 Apr 2008 23:20:26 -0000 1.2 @@ -384,7 +384,7 @@ if (wiki == null) { ActionErrors errors = new ActionErrors(); errors.add("activity.globel", new ActionMessage( - "error.fail.get.forum")); + "error.fail.get.wiki")); this.addErrors(request, errors); return mapping.getInputForward(); } @@ -419,7 +419,7 @@ if (wiki == null) { ActionErrors errors = new ActionErrors(); errors.add("instruction.globel", new ActionMessage( - "error.fail.get.forum")); + "error.fail.get.wiki")); this.addErrors(request, errors); return mapping.getInputForward(); } Index: lams_tool_wiki_orig/src/java/org/lams/lams/tool/wiki/web/forms/MessageForm.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki_orig/src/java/org/lams/lams/tool/wiki/web/forms/Attic/MessageForm.java,v diff -u -r1.1 -r1.2 --- lams_tool_wiki_orig/src/java/org/lams/lams/tool/wiki/web/forms/MessageForm.java 2 Apr 2008 02:51:15 -0000 1.1 +++ lams_tool_wiki_orig/src/java/org/lams/lams/tool/wiki/web/forms/MessageForm.java 2 Apr 2008 23:20:26 -0000 1.2 @@ -74,11 +74,11 @@ ActionErrors errors = new ActionErrors(); try{ if (StringUtils.isBlank(message.getSubject())) { - ActionMessage error = new ActionMessage("error.subject.required"); + ActionMessage error = new ActionMessage("error.wikiTitle.required"); errors.add("message.subject", error); } if (StringUtils.isBlank(message.getBody())) { - ActionMessage error = new ActionMessage("error.body.required"); + ActionMessage error = new ActionMessage("error.pageContent.required"); errors.add("message.body", error); } Index: lams_tool_wiki_orig/web/WEB-INF/struts/validation.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki_orig/web/WEB-INF/struts/validation.xml,v diff -u -r1.1 -r1.2 --- lams_tool_wiki_orig/web/WEB-INF/struts/validation.xml 2 Apr 2008 02:51:16 -0000 1.1 +++ lams_tool_wiki_orig/web/WEB-INF/struts/validation.xml 2 Apr 2008 23:20:26 -0000 1.2 @@ -22,15 +22,15 @@ Index: lams_tool_wiki_orig/web/jsps/authoring/basic.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki_orig/web/jsps/authoring/basic.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_wiki_orig/web/jsps/authoring/basic.jsp 2 Apr 2008 02:51:16 -0000 1.1 +++ lams_tool_wiki_orig/web/jsps/authoring/basic.jsp 2 Apr 2008 23:20:26 -0000 1.2 @@ -71,7 +71,7 @@ ');" class="button-add-item">Index: lams_tool_wiki_orig/web/jsps/authoring/message/create.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki_orig/web/jsps/authoring/message/create.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_wiki_orig/web/jsps/authoring/message/create.jsp 2 Apr 2008 02:51:16 -0000 1.1 +++ lams_tool_wiki_orig/web/jsps/authoring/message/create.jsp 2 Apr 2008 23:20:25 -0000 1.2 @@ -20,7 +20,7 @@ value="${sessionScope[formBean.sessionMapID]}" />
- | |||||
|
|||||
- | |||||
- | |||||
<%-- If limitChars == 0, then we don't want to limit the characters at all. --%> |