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.14 -r1.15 --- lams_tool_wiki_orig/conf/language/lams/ApplicationResources.properties 3 Jun 2008 03:58:53 -0000 1.14 +++ lams_tool_wiki_orig/conf/language/lams/ApplicationResources.properties 13 Jun 2008 00:36:07 -0000 1.15 @@ -135,7 +135,8 @@ label.authoring.advance.allow.upload =Allow learners to add attachments label.authoring.advance.allow.new.wiki.page =Allow learners to create new wiki pages label.authoring.advance.allow.attach.image =Allow learners to attach images -label.authoring.advance.allow.insert.link =Allow learners to insert external links +label.authoring.advance.allow.insert.wiki.link =Allow learners to insert links to other wiki pages +label.authoring.advance.allow.insert.external.link =Allow learners to insert external links label.authoring.advance.allow.revert.page =Allow learners to revert pages to previous versions error.pageContent.required =Page content cannot be blank. error.wikiTitle.required =Wiki title can not be blank. 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.14 -r1.15 --- lams_tool_wiki_orig/conf/language/lams/ApplicationResources_en_AU.properties 3 Jun 2008 03:58:53 -0000 1.14 +++ lams_tool_wiki_orig/conf/language/lams/ApplicationResources_en_AU.properties 13 Jun 2008 00:36:07 -0000 1.15 @@ -135,7 +135,8 @@ label.authoring.advance.allow.upload =Allow learners to add attachments label.authoring.advance.allow.new.wiki.page =Allow learners to create new wiki pages label.authoring.advance.allow.attach.image =Allow learners to attach images -label.authoring.advance.allow.insert.link =Allow learners to insert external links +label.authoring.advance.allow.insert.wiki.link =Allow learners to insert links to other wiki pages +label.authoring.advance.allow.insert.external.link =Allow learners to insert external links label.authoring.advance.allow.revert.page =Allow learners to revert pages to previous versions error.pageContent.required =Page content cannot be blank. error.wikiTitle.required =Wiki title can not be blank. 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.12 -r1.13 --- lams_tool_wiki_orig/db/sql/create_lams_tool_wiki.sql 15 Apr 2008 03:25:13 -0000 1.12 +++ lams_tool_wiki_orig/db/sql/create_lams_tool_wiki.sql 13 Jun 2008 00:36:08 -0000 1.13 @@ -37,7 +37,8 @@ allow_rich_editor smallint, allow_new_wiki_page smallint, allow_attach_image smallint, - allow_insert_link smallint, + allow_insert_wiki_link smallint, + allow_insert_external_link smallint, allow_revert_page smallint, allow_upload smallint, maximum_reply integer, @@ -119,8 +120,8 @@ INSERT INTO tl_lawiki10_wiki (uid,title,instructions,online_instructions,offline_instructions,content_id,allow_anonym,run_offline,lock_on_finished,content_in_use,define_later,allow_rich_editor, - allow_new_wiki_page,allow_attach_image,allow_insert_link,allow_revert_page,allow_upload,maximum_reply, minimum_reply,reflect_on_activity) -VALUES(1,"Wiki","Instructions",null,null,${default_content_id},0,0,0,0,0,0,1,1,0,0,0,0,0,0); + allow_new_wiki_page,allow_attach_image,allow_insert_wiki_link,allow_insert_external_link,allow_revert_page,allow_upload,maximum_reply, minimum_reply,reflect_on_activity) +VALUES(1,"Wiki","Instructions",null,null,${default_content_id},0,0,0,0,0,0,1,1,0,0,0,0,0,0,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,'Wiki Page','Wiki content',1,0,NULL,NULL,1,0,0,NULL); Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/persistence/Wiki.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/persistence/Wiki.java,v diff -u -r1.8 -r1.9 --- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/persistence/Wiki.java 15 Apr 2008 03:25:13 -0000 1.8 +++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/persistence/Wiki.java 13 Jun 2008 00:36:08 -0000 1.9 @@ -58,7 +58,8 @@ private boolean allowAnonym; private boolean allowNewWikiPage; private boolean allowAttachImage; - private boolean allowInsertLink; + private boolean allowInsertWikiLink; + private boolean allowInsertExternalLink; private boolean allowRevertPage; private boolean allowUpload; private int maximumReply; @@ -470,15 +471,25 @@ this.allowAttachImage = allowAttachImage; } /** - * @hibernate.property column="allow_insert_link" + * @hibernate.property column="allow_insert_wiki_link" * @return */ - public boolean isAllowInsertLink() { - return allowInsertLink; + public boolean isAllowInsertWikiLink() { + return allowInsertWikiLink; } - public void setAllowInsertLink(boolean allowInsertLink) { - this.allowInsertLink = allowInsertLink; + public void setAllowInsertWikiLink(boolean allowInsertWikiLink) { + this.allowInsertWikiLink = allowInsertWikiLink; + } + /** + * @hibernate.property column="allow_insert_external_link" + * @return + */ + public boolean isAllowInsertExternalLink() { + return allowInsertExternalLink; } + public void setAllowInsertExternalLink(boolean allowInsertExternalLink) { + this.allowInsertExternalLink = allowInsertExternalLink; + } /** * @hibernate.property column="allow_revert_page" * @return Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java,v diff -u -r1.8 -r1.9 --- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java 15 Apr 2008 03:25:13 -0000 1.8 +++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java 13 Jun 2008 00:36:08 -0000 1.9 @@ -912,7 +912,8 @@ toolContentObj.setAllowAnonym(Boolean.FALSE); toolContentObj.setAllowNewWikiPage(Boolean.FALSE); // this is the default value toolContentObj.setAllowAttachImage(Boolean.TRUE); // this is the default value - toolContentObj.setAllowInsertLink(Boolean.FALSE); // this is the default value + toolContentObj.setAllowInsertWikiLink(Boolean.FALSE); // this is the default value + toolContentObj.setAllowInsertExternalLink(Boolean.FALSE); // this is the default value toolContentObj.setAllowRevertPage(Boolean.FALSE); // this is the default value //toolContentObj.setAllowRichEditor(Boolean.FALSE); toolContentObj.setAllowUpload(Boolean.TRUE); // this is the default value Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java,v diff -u -r1.10 -r1.11 --- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java 12 Jun 2008 03:03:07 -0000 1.10 +++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java 13 Jun 2008 00:36:07 -0000 1.11 @@ -62,7 +62,8 @@ public static final String ATTR_ALLOW_UPLOAD = "allowUpload"; public static final String ATTR_ALLOW_NEW_WIKI_PAGES = "allowNewWikiPages"; public static final String ATTR_ALLOW_ATTACH_IMAGES = "allowAttachImages"; - public static final String ATTR_ALLOW_INSERT_LINKS = "allowInsertLinks"; + public static final String ATTR_ALLOW_INSERT_WIKI_LINKS = "allowInsertWikiLinks"; + public static final String ATTR_ALLOW_INSERT_EXTERNAL_LINKS = "allowInsertExternalLinks"; public static final String ATTR_ALLOW_REVERT_PAGES = "allowRevertPages"; public static final String ATTR_MAXIMUM_REPLIES = "maximumReplies"; public static final String ATTR_ALLOW_RICH_EDITOR = "allowRichEditor"; Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java,v diff -u -r1.10 -r1.11 --- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java 12 Jun 2008 03:03:07 -0000 1.10 +++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java 13 Jun 2008 00:36:08 -0000 1.11 @@ -225,7 +225,8 @@ sessionMap.put(WikiConstants.ATTR_ALLOW_UPLOAD,wiki.isAllowUpload()); sessionMap.put(WikiConstants.ATTR_ALLOW_NEW_WIKI_PAGES,wiki.isAllowNewWikiPage()); sessionMap.put(WikiConstants.ATTR_ALLOW_ATTACH_IMAGES,wiki.isAllowAttachImage()); - sessionMap.put(WikiConstants.ATTR_ALLOW_INSERT_LINKS,wiki.isAllowInsertLink()); + sessionMap.put(WikiConstants.ATTR_ALLOW_INSERT_WIKI_LINKS,wiki.isAllowInsertWikiLink()); + sessionMap.put(WikiConstants.ATTR_ALLOW_INSERT_EXTERNAL_LINKS,wiki.isAllowInsertExternalLink()); sessionMap.put(WikiConstants.ATTR_ALLOW_REVERT_PAGES,wiki.isAllowRevertPage()); sessionMap.put(WikiConstants.ATTR_MAXIMUM_REPLIES,wiki.getMaximumReply()); sessionMap.put(WikiConstants.ATTR_ALLOW_RICH_EDITOR,allowRichEditor); Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiForm.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiForm.java,v diff -u -r1.8 -r1.9 --- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiForm.java 15 Apr 2008 03:25:13 -0000 1.8 +++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiForm.java 13 Jun 2008 00:36:07 -0000 1.9 @@ -115,7 +115,8 @@ wiki.setLockWhenFinished(false); wiki.setAllowNewWikiPage(false); wiki.setAllowAttachImage(false); - wiki.setAllowInsertLink(false); + wiki.setAllowInsertWikiLink(false); + wiki.setAllowInsertExternalLink(false); wiki.setAllowRevertPage(false); wiki.setAllowUpload(false); wiki.setReflectOnActivity(false); Index: lams_tool_wiki_orig/web/jsps/authoring/advance.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki_orig/web/jsps/authoring/advance.jsp,v diff -u -r1.13 -r1.14 --- lams_tool_wiki_orig/web/jsps/authoring/advance.jsp 3 Jun 2008 03:58:53 -0000 1.13 +++ lams_tool_wiki_orig/web/jsps/authoring/advance.jsp 13 Jun 2008 00:36:07 -0000 1.14 @@ -32,23 +32,31 @@

- + -

-

Index: lams_tool_wiki_orig/web/jsps/learning/toolbarButtons.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki_orig/web/jsps/learning/toolbarButtons.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_wiki_orig/web/jsps/learning/toolbarButtons.jsp 15 Apr 2008 00:58:23 -0000 1.1 +++ lams_tool_wiki_orig/web/jsps/learning/toolbarButtons.jsp 13 Jun 2008 00:36:08 -0000 1.2 @@ -11,7 +11,10 @@ if (!${sessionMap.allowAttachImages}) { hideToolbarItem(editorInstance, 'Image'); } - if (!${sessionMap.allowInsertLinks}) { + if (!${sessionMap.allowInsertWikiLinks}) { + hideToolbarItem(editorInstance, 'WikiLink'); + } + if (!${sessionMap.allowInsertExternalLinks}) { hideToolbarItem(editorInstance, 'Link'); } document.getElementById("fckbox").style.visibility = 'visible'; Index: lams_tool_wiki_orig/web/jsps/learning/message/topicview.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki_orig/web/jsps/learning/message/topicview.jsp,v diff -u -r1.6 -r1.7 --- lams_tool_wiki_orig/web/jsps/learning/message/topicview.jsp 12 Jun 2008 03:03:07 -0000 1.6 +++ lams_tool_wiki_orig/web/jsps/learning/message/topicview.jsp 13 Jun 2008 00:36:08 -0000 1.7 @@ -134,11 +134,11 @@ - + test='${ (sessionMap.mode == "teacher") + || (not sessionMap.finishedLock && (empty msgDto.mark) && ((msgDto.message.replyNumber < sessionMap.maximumReplies) || sessionMap.maximumReplies == 0)) }'>