Index: lams_tool_wiki_orig/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r1e131f532456c075126b0bb76ecc385f19ff98cf -rf461583f3022a937d0a06aee931827145f4a1c1c --- lams_tool_wiki_orig/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 1e131f532456c075126b0bb76ecc385f19ff98cf) +++ lams_tool_wiki_orig/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision f461583f3022a937d0a06aee931827145f4a1c1c) @@ -133,6 +133,7 @@ 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 +label.authoring.advance.allow.new.wiki.page =Allow learners to create new wiki pages error.pageContent.required =Page content cannot be blank. error.wikiTitle.required =Wiki title can not be blank. label.default.user.name =Instructor Index: lams_tool_wiki_orig/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -r1e131f532456c075126b0bb76ecc385f19ff98cf -rf461583f3022a937d0a06aee931827145f4a1c1c --- lams_tool_wiki_orig/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 1e131f532456c075126b0bb76ecc385f19ff98cf) +++ lams_tool_wiki_orig/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision f461583f3022a937d0a06aee931827145f4a1c1c) @@ -133,6 +133,7 @@ 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 +label.authoring.advance.allow.new.wiki.page =Allow learners to create new wiki pages error.pageContent.required =Page content cannot be blank. error.wikiTitle.required =Wiki title can not be blank. label.default.user.name =Instructor Index: lams_tool_wiki_orig/db/sql/create_lams_tool_wiki.sql =================================================================== diff -u -rfbc3b6e5c7d55e5f8a49719dc095e0dd9f8e844d -rf461583f3022a937d0a06aee931827145f4a1c1c --- lams_tool_wiki_orig/db/sql/create_lams_tool_wiki.sql (.../create_lams_tool_wiki.sql) (revision fbc3b6e5c7d55e5f8a49719dc095e0dd9f8e844d) +++ lams_tool_wiki_orig/db/sql/create_lams_tool_wiki.sql (.../create_lams_tool_wiki.sql) (revision f461583f3022a937d0a06aee931827145f4a1c1c) @@ -37,6 +37,7 @@ allow_edit smallint, allow_rich_editor smallint, allow_new_topic smallint, + allow_new_wiki_page smallint, allow_upload smallint, maximum_reply integer, minimum_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_edit,allow_rich_editor, - allow_new_topic,allow_upload,maximum_reply, minimum_reply,limited_input_flag,limited_of_chars,reflect_on_activity) -VALUES(1,"Wiki","Instructions",null,null,${default_content_id},0,0,0,0,0,1,0,1,0,1,0,1,5000,0); + allow_new_topic,allow_new_wiki_page,allow_upload,maximum_reply, minimum_reply,limited_input_flag,limited_of_chars,reflect_on_activity) +VALUES(1,"Wiki","Instructions",null,null,${default_content_id},0,0,0,0,0,1,0,1,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,'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 =================================================================== diff -u -r51ab92ac37624b5c280cbd5f3ae8e3972b8540ff -rf461583f3022a937d0a06aee931827145f4a1c1c --- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/persistence/Wiki.java (.../Wiki.java) (revision 51ab92ac37624b5c280cbd5f3ae8e3972b8540ff) +++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/persistence/Wiki.java (.../Wiki.java) (revision f461583f3022a937d0a06aee931827145f4a1c1c) @@ -58,6 +58,7 @@ private boolean allowAnonym; private boolean allowEdit; private boolean allowNewTopic; + private boolean allowNewWikiPage; private boolean allowUpload; private int maximumReply; private int minimumReply; @@ -491,6 +492,16 @@ this.allowNewTopic = allowNewTopic; } /** + * @hibernate.property column="allow_new_wiki_page" + * @return + */ + public boolean isAllowNewWikiPage() { + return allowNewWikiPage; + } + public void setAllowNewWikiPage(boolean allowNewWikiPage) { + this.allowNewWikiPage = allowNewWikiPage; + } + /** * @hibernate.property column="allow_upload" * @return */ Index: lams_tool_wiki_orig/web/jsps/authoring/advance.jsp =================================================================== diff -u -r1e131f532456c075126b0bb76ecc385f19ff98cf -rf461583f3022a937d0a06aee931827145f4a1c1c --- lams_tool_wiki_orig/web/jsps/authoring/advance.jsp (.../advance.jsp) (revision 1e131f532456c075126b0bb76ecc385f19ff98cf) +++ lams_tool_wiki_orig/web/jsps/authoring/advance.jsp (.../advance.jsp) (revision f461583f3022a937d0a06aee931827145f4a1c1c) @@ -14,6 +14,15 @@

+ + + +

+ +