Index: lams_tool_wiki_orig/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r7aa2861ddc577b49cef219ab58f43596019f10ec -rbde9cc9b282f974aeb3fb19a0c54db82a52566e4
--- lams_tool_wiki_orig/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 7aa2861ddc577b49cef219ab58f43596019f10ec)
+++ lams_tool_wiki_orig/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision bde9cc9b282f974aeb3fb19a0c54db82a52566e4)
@@ -134,6 +134,7 @@
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
+label.authoring.advance.allow.attach.image =Allow learners to attach images
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 -r7aa2861ddc577b49cef219ab58f43596019f10ec -rbde9cc9b282f974aeb3fb19a0c54db82a52566e4
--- lams_tool_wiki_orig/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 7aa2861ddc577b49cef219ab58f43596019f10ec)
+++ lams_tool_wiki_orig/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision bde9cc9b282f974aeb3fb19a0c54db82a52566e4)
@@ -134,6 +134,7 @@
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
+label.authoring.advance.allow.attach.image =Allow learners to attach images
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 -r7aa2861ddc577b49cef219ab58f43596019f10ec -rbde9cc9b282f974aeb3fb19a0c54db82a52566e4
--- lams_tool_wiki_orig/db/sql/create_lams_tool_wiki.sql (.../create_lams_tool_wiki.sql) (revision 7aa2861ddc577b49cef219ab58f43596019f10ec)
+++ lams_tool_wiki_orig/db/sql/create_lams_tool_wiki.sql (.../create_lams_tool_wiki.sql) (revision bde9cc9b282f974aeb3fb19a0c54db82a52566e4)
@@ -37,6 +37,7 @@
allow_edit smallint,
allow_rich_editor smallint,
allow_new_wiki_page smallint,
+ allow_attach_image 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_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,0,1,0,1,5000,0);
+ allow_new_wiki_page,allow_attach_image,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 -r7aa2861ddc577b49cef219ab58f43596019f10ec -rbde9cc9b282f974aeb3fb19a0c54db82a52566e4
--- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/persistence/Wiki.java (.../Wiki.java) (revision 7aa2861ddc577b49cef219ab58f43596019f10ec)
+++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/persistence/Wiki.java (.../Wiki.java) (revision bde9cc9b282f974aeb3fb19a0c54db82a52566e4)
@@ -39,7 +39,7 @@
/**
* Wiki
- * @author conradb
+ * @author dcarlier, forum base code by conradb
*
* @hibernate.class table="tl_lawiki10_wiki"
*
@@ -58,6 +58,7 @@
private boolean allowAnonym;
private boolean allowEdit;
private boolean allowNewWikiPage;
+ private boolean allowAttachImage;
private boolean allowUpload;
private int maximumReply;
private int minimumReply;
@@ -491,6 +492,16 @@
this.allowNewWikiPage = allowNewWikiPage;
}
/**
+ * @hibernate.property column="allow_attach_image"
+ * @return
+ */
+ public boolean isAllowAttachImage() {
+ return allowAttachImage;
+ }
+ public void setAllowAttachImage(boolean allowAttachImage) {
+ this.allowAttachImage = allowAttachImage;
+ }
+ /**
* @hibernate.property column="allow_upload"
* @return
*/
Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java
===================================================================
diff -u -r7aa2861ddc577b49cef219ab58f43596019f10ec -rbde9cc9b282f974aeb3fb19a0c54db82a52566e4
--- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java (.../WikiService.java) (revision 7aa2861ddc577b49cef219ab58f43596019f10ec)
+++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java (.../WikiService.java) (revision bde9cc9b282f974aeb3fb19a0c54db82a52566e4)
@@ -911,7 +911,8 @@
toolContentObj.setAllowAnonym(Boolean.FALSE);
toolContentObj.setAllowEdit(Boolean.TRUE); // this is the default value
- toolContentObj.setAllowNewWikiPage(Boolean.TRUE);
+ toolContentObj.setAllowNewWikiPage(Boolean.FALSE); // this is the default value
+ toolContentObj.setAllowAttachImage(Boolean.TRUE);
//toolContentObj.setAllowRichEditor(Boolean.FALSE);
toolContentObj.setAllowUpload(Boolean.TRUE); // this is the default value
toolContentObj.setContentId(toolContentId);
Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java
===================================================================
diff -u -r7aa2861ddc577b49cef219ab58f43596019f10ec -rbde9cc9b282f974aeb3fb19a0c54db82a52566e4
--- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java (.../WikiConstants.java) (revision 7aa2861ddc577b49cef219ab58f43596019f10ec)
+++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java (.../WikiConstants.java) (revision bde9cc9b282f974aeb3fb19a0c54db82a52566e4)
@@ -62,6 +62,7 @@
public static final String ATTR_ALLOW_EDIT = "allowEdit";
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_RICH_EDITOR = "allowRichEditor";
public static final String ATTR_LIMITED_CHARS = "limitedChars";
Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java
===================================================================
diff -u -r7aa2861ddc577b49cef219ab58f43596019f10ec -rbde9cc9b282f974aeb3fb19a0c54db82a52566e4
--- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java (.../LearningAction.java) (revision 7aa2861ddc577b49cef219ab58f43596019f10ec)
+++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java (.../LearningAction.java) (revision bde9cc9b282f974aeb3fb19a0c54db82a52566e4)
@@ -232,6 +232,7 @@
sessionMap.put(WikiConstants.ATTR_ALLOW_EDIT, wiki.isAllowEdit());
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_RICH_EDITOR,allowRichEditor);
sessionMap.put(WikiConstants.ATTR_LIMITED_CHARS,new Integer(allowNumber));
sessionMap.put(WikiConstants.ATTR_REFLECTION_ON,wiki.isReflectOnActivity());
Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiForm.java
===================================================================
diff -u -r7aa2861ddc577b49cef219ab58f43596019f10ec -rbde9cc9b282f974aeb3fb19a0c54db82a52566e4
--- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiForm.java (.../WikiForm.java) (revision 7aa2861ddc577b49cef219ab58f43596019f10ec)
+++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiForm.java (.../WikiForm.java) (revision bde9cc9b282f974aeb3fb19a0c54db82a52566e4)
@@ -117,6 +117,7 @@
wiki.setLimitedInput(false);
wiki.setLockWhenFinished(false);
wiki.setAllowNewWikiPage(false);
+ wiki.setAllowAttachImage(false);
wiki.setAllowUpload(false);
wiki.setReflectOnActivity(false);
}
Index: lams_tool_wiki_orig/web/jsps/authoring/advance.jsp
===================================================================
diff -u -r7aa2861ddc577b49cef219ab58f43596019f10ec -rbde9cc9b282f974aeb3fb19a0c54db82a52566e4
--- lams_tool_wiki_orig/web/jsps/authoring/advance.jsp (.../advance.jsp) (revision 7aa2861ddc577b49cef219ab58f43596019f10ec)
+++ lams_tool_wiki_orig/web/jsps/authoring/advance.jsp (.../advance.jsp) (revision bde9cc9b282f974aeb3fb19a0c54db82a52566e4)
@@ -23,6 +23,15 @@
+
+
+
+
+
+