Index: lams_tool_forum/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -r8fcae2b75edffc58fe627837741743b0d9bba4f0 -r3fbb95f74569a2eab286873c39982ac3e0a11ce8 --- lams_tool_forum/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 8fcae2b75edffc58fe627837741743b0d9bba4f0) +++ lams_tool_forum/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 3fbb95f74569a2eab286873c39982ac3e0a11ce8) @@ -25,6 +25,7 @@ label.authoring.advance.allow.edit =Allow learners to change their own postings label.authoring.advance.use.richeditor =Allow learners to use rich text editor label.authoring.advance.limited.input =Maximum number of characters per posting +label.authoring.advance.min.limited.input =Minimum number of characters per posting lable.topic.title.subject =Subject lable.topic.title.body =Body lable.topic.title.update =Last post @@ -229,5 +230,6 @@ js.error.validate.number =There is an error with the minimum and/or maximum set for ratings. Please check and try again. label.rateLimits.topic.reminder =You have rated {0} postings already. +label.char.required =Characters required #======= End labels: Exported 222 labels for en AU ===== Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20141216.sql =================================================================== diff -u --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20141216.sql (revision 0) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20141216.sql (revision 3fbb95f74569a2eab286873c39982ac3e0a11ce8) @@ -0,0 +1,17 @@ +-- Turn off autocommit, so nothing is committed if there is an error +SET AUTOCOMMIT = 0; +SET FOREIGN_KEY_CHECKS=0; +----------------------Put all sql statements below here------------------------- + +-- LDEV-3395 Implement a minimum number of characters for forum postings +ALTER TABLE tl_lafrum11_forum ADD COLUMN min_characters integer DEFAULT 0; +ALTER TABLE tl_lafrum11_forum ADD COLUMN limited_min_characters tinyint DEFAULT 0; + +UPDATE lams_tool SET tool_version='20140102' WHERE tool_signature='lafrum11'; + +----------------------Put all sql statements above here------------------------- + +-- If there were no errors, commit and restore autocommit to on +COMMIT; +SET AUTOCOMMIT = 1; +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.java =================================================================== diff -u -r3fd384118cee7535fc2e8a3964be830e26b97612 -r3fbb95f74569a2eab286873c39982ac3e0a11ce8 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.java (.../Forum.java) (revision 3fd384118cee7535fc2e8a3964be830e26b97612) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.java (.../Forum.java) (revision 3fbb95f74569a2eab286873c39982ac3e0a11ce8) @@ -90,10 +90,14 @@ private ForumUser createdBy; private Set messages; + + private int minCharacters; + + private boolean limitedMinCharacters; - private int limitedChar; + private int maxCharacters; - private boolean limitedInput; + private boolean limitedMaxCharacters; private boolean reflectOnActivity; @@ -418,29 +422,53 @@ return toContent; } + + /** + * @hibernate.property column="min_characters" + * @return + */ + public int getMinCharacters() { + return minCharacters; + } + public void setMinCharacters(int minCharacters) { + this.minCharacters = minCharacters; + } + /** + * @hibernate.property column="limited_min_characters" + * @return + */ + public boolean isLimitedMinCharacters() { + return limitedMinCharacters; + } + + public void setLimitedMinCharacters(boolean limitedMinCharacters) { + this.limitedMinCharacters = limitedMinCharacters; + } + + /** * @hibernate.property column="limited_of_chars" * @return */ - public int getLimitedChar() { - return limitedChar; + public int getMaxCharacters() { + return maxCharacters; } - public void setLimitedChar(int limitedChar) { - this.limitedChar = limitedChar; + public void setMaxCharacters(int maxCharacters) { + this.maxCharacters = maxCharacters; } /** * @hibernate.property column="limited_input_flag" * @return */ - public boolean isLimitedInput() { - return limitedInput; + public boolean isLimitedMaxCharacters() { + return limitedMaxCharacters; } - public void setLimitedInput(boolean limitedInput) { - this.limitedInput = limitedInput; + public void setLimitedMaxCharacters(boolean limitedMaxCharacters) { + this.limitedMaxCharacters = limitedMaxCharacters; } /** Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java =================================================================== diff -u -r6d8df8768f59d302828ef64bf3cb7c8d485975b8 -r3fbb95f74569a2eab286873c39982ac3e0a11ce8 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java (.../ForumService.java) (revision 6d8df8768f59d302828ef64bf3cb7c8d485975b8) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java (.../ForumService.java) (revision 3fbb95f74569a2eab286873c39982ac3e0a11ce8) @@ -1124,7 +1124,7 @@ toolContentObj.setDefineLater(Boolean.FALSE); toolContentObj.setInstructions(WebUtil.convertNewlines((String) importValues .get(ToolContentImport102Manager.CONTENT_BODY))); - toolContentObj.setLimitedChar(5000); // this is the default value + toolContentObj.setMaxCharacters(5000); // this is the default value toolContentObj.setReflectOnActivity(Boolean.FALSE); toolContentObj.setReflectInstructions(null); Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java =================================================================== diff -u -r281244f5d518e88719ffc871ac71bb03136cb03e -r3fbb95f74569a2eab286873c39982ac3e0a11ce8 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java (.../ForumConstants.java) (revision 281244f5d518e88719ffc871ac71bb03136cb03e) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java (.../ForumConstants.java) (revision 3fbb95f74569a2eab286873c39982ac3e0a11ce8) @@ -82,8 +82,10 @@ public static final String ATTR_MINIMUM_RATE = "minimumRate"; public static final String ATTR_MAXIMUM_RATE = "maximumRate"; + + public static final String ATTR_MIN_CHARACTERS = "minCharacters"; - public static final String ATTR_LIMITED_CHARS = "limitedChars"; + public static final String ATTR_MAX_CHARACTERS = "maxCharacters"; public static final String ATTR_LOCK_WHEN_FINISHED = "lockedWhenFinished"; Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java =================================================================== diff -u -ra71eb6d1262d4adfd8ae73a5b150084c9eb6e199 -r3fbb95f74569a2eab286873c39982ac3e0a11ce8 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java (.../AuthoringAction.java) (revision a71eb6d1262d4adfd8ae73a5b150084c9eb6e199) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java (.../AuthoringAction.java) (revision 3fbb95f74569a2eab286873c39982ac3e0a11ce8) @@ -865,8 +865,8 @@ if (StringUtils.equals(modeStr, ToolAccessMode.TEACHER.toString())) { return errors; } - if (!form.getForum().isAllowRichEditor() && form.getForum().isLimitedInput()) { - if (form.getForum().getLimitedChar() <= 0) { + if (!form.getForum().isAllowRichEditor() && form.getForum().isLimitedMaxCharacters()) { + if (form.getForum().getMaxCharacters() <= 0) { ActionMessage error = new ActionMessage("error.limit.char.less.zero"); errors.add(ActionMessages.GLOBAL_MESSAGE, error); } Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java =================================================================== diff -u -r281244f5d518e88719ffc871ac71bb03136cb03e -r3fbb95f74569a2eab286873c39982ac3e0a11ce8 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java (.../LearningAction.java) (revision 281244f5d518e88719ffc871ac71bb03136cb03e) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java (.../LearningAction.java) (revision 3fbb95f74569a2eab286873c39982ac3e0a11ce8) @@ -213,7 +213,8 @@ // Indicate don't restrict number of chars by allowNumber = 0 Long forumId = forum.getUid(); Boolean allowRichEditor = new Boolean(forum.isAllowRichEditor()); - int allowNumber = forum.isLimitedInput() || forum.isAllowRichEditor() ? forum.getLimitedChar() : 0; + int minCharacters = forum.isLimitedMinCharacters() ? forum.getMinCharacters() : 0; + int maxCharacters = forum.isLimitedMaxCharacters() || forum.isAllowRichEditor() ? forum.getMaxCharacters() : 0; sessionMap.put(AttributeNames.ATTR_MODE, mode); sessionMap.put(ForumConstants.ATTR_FORUM_ID, forumId); @@ -229,7 +230,8 @@ sessionMap.put(ForumConstants.ATTR_MAXIMUM_RATE, forum.getMaximumRate()); sessionMap.put(ForumConstants.ATTR_ALLOW_NEW_TOPICS, forum.isAllowNewTopic()); sessionMap.put(ForumConstants.ATTR_ALLOW_RICH_EDITOR, allowRichEditor); - sessionMap.put(ForumConstants.ATTR_LIMITED_CHARS, new Integer(allowNumber)); + sessionMap.put(ForumConstants.ATTR_MIN_CHARACTERS, new Integer(minCharacters)); + sessionMap.put(ForumConstants.ATTR_MAX_CHARACTERS, new Integer(maxCharacters)); sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID, sessionId); sessionMap.put(ForumConstants.ATTR_FORUM_TITLE, forum.getTitle()); sessionMap.put(ForumConstants.ATTR_FORUM_INSTRCUTION, forum.getInstructions()); Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumForm.java =================================================================== diff -u -r6d674e346dea6ce7a824366c8a7c315660677744 -r3fbb95f74569a2eab286873c39982ac3e0a11ce8 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumForm.java (.../ForumForm.java) (revision 6d674e346dea6ce7a824366c8a7c315660677744) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumForm.java (.../ForumForm.java) (revision 3fbb95f74569a2eab286873c39982ac3e0a11ce8) @@ -96,7 +96,7 @@ forum.setAllowEdit(false); forum.setAllowAnonym(false); forum.setAllowRichEditor(false); - forum.setLimitedInput(false); + forum.setLimitedMaxCharacters(false); forum.setLockWhenFinished(false); forum.setAllowNewTopic(false); forum.setAllowUpload(false); Index: lams_tool_forum/web/jsps/authoring/advance.jsp =================================================================== diff -u -r281244f5d518e88719ffc871ac71bb03136cb03e -r3fbb95f74569a2eab286873c39982ac3e0a11ce8 --- lams_tool_forum/web/jsps/authoring/advance.jsp (.../advance.jsp) (revision 281244f5d518e88719ffc871ac71bb03136cb03e) +++ lams_tool_forum/web/jsps/authoring/advance.jsp (.../advance.jsp) (revision 3fbb95f74569a2eab286873c39982ac3e0a11ce8) @@ -5,27 +5,21 @@

- - +

- - +

- - + @@ -68,88 +62,85 @@

- - +

- - +

- - -

+ +

+ + - +

- - +

- - +

- - +

- - +

- + + +

@@ -158,17 +149,15 @@

- + onclick="allowNewTopic()" styleId="allowNewTopic1" styleClass="noBorder"/>

- + onclick="allowNewTopic()" styleId="allowNewTopic2" styleClass="noBorder"/> @@ -192,7 +181,6 @@ 10 - @@ -213,99 +201,119 @@

Index: lams_tool_forum/web/jsps/learning/create.jsp =================================================================== diff -u -r172f7888a9cc330a3141e9fd1114aa1b17ef92c0 -r3fbb95f74569a2eab286873c39982ac3e0a11ce8 --- lams_tool_forum/web/jsps/learning/create.jsp (.../create.jsp) (revision 172f7888a9cc330a3141e9fd1114aa1b17ef92c0) +++ lams_tool_forum/web/jsps/learning/create.jsp (.../create.jsp) (revision 3fbb95f74569a2eab286873c39982ac3e0a11ce8) @@ -1,9 +1,7 @@ <%@ include file="/common/taglibs.jsp"%> - + - + Index: lams_tool_forum/web/jsps/learning/edit.jsp =================================================================== diff -u -r172f7888a9cc330a3141e9fd1114aa1b17ef92c0 -r3fbb95f74569a2eab286873c39982ac3e0a11ce8 --- lams_tool_forum/web/jsps/learning/edit.jsp (.../edit.jsp) (revision 172f7888a9cc330a3141e9fd1114aa1b17ef92c0) +++ lams_tool_forum/web/jsps/learning/edit.jsp (.../edit.jsp) (revision 3fbb95f74569a2eab286873c39982ac3e0a11ce8) @@ -4,23 +4,21 @@ - +
- -

- -

- - - + +

+ +

+

- + - - <%@ include file="/jsps/learning/message/topiceditform.jsp"%> - + + <%@ include file="/jsps/learning/message/topiceditform.jsp"%> +
Index: lams_tool_forum/web/jsps/learning/message/bodyarea.jsp =================================================================== diff -u -r7817bc4fce30416c9737875ae2d137be0c6aa8ba -r3fbb95f74569a2eab286873c39982ac3e0a11ce8 --- lams_tool_forum/web/jsps/learning/message/bodyarea.jsp (.../bodyarea.jsp) (revision 7817bc4fce30416c9737875ae2d137be0c6aa8ba) +++ lams_tool_forum/web/jsps/learning/message/bodyarea.jsp (.../bodyarea.jsp) (revision 3fbb95f74569a2eab286873c39982ac3e0a11ce8) @@ -8,40 +8,79 @@ toolbarSet="DefaultLearner"> + - <%-- Does not user general tag becuase this field need keep compatible with FCKEditor's content --%> + + <%-- Does not user general tag becuase this field need keep compatible with CKEditor's content --%>
+ <%-- If limitChars == 0, then we don't want to limit the characters at all. --%> - - : - - + + : + +
+ +
+ + + : + + + + var count = (limit - bodyTxt.value.length) > 0 ? limit - bodyTxt.value.length : 0; + limitCount.value = count; + showDiv.innerHTML = count; + } + calculateRequired(); + + bodyTxt.onkeyup = calculateRequired; + }); +
Index: lams_tool_forum/web/jsps/learning/message/topiceditform.jsp =================================================================== diff -u -rdb44c0602e8fa1b68b2ebce18a58a3d8215cc61b -r3fbb95f74569a2eab286873c39982ac3e0a11ce8 --- lams_tool_forum/web/jsps/learning/message/topiceditform.jsp (.../topiceditform.jsp) (revision db44c0602e8fa1b68b2ebce18a58a3d8215cc61b) +++ lams_tool_forum/web/jsps/learning/message/topiceditform.jsp (.../topiceditform.jsp) (revision 3fbb95f74569a2eab286873c39982ac3e0a11ce8) @@ -1,45 +1,48 @@ <%@ include file="/common/taglibs.jsp"%> +
+ +
- -
- -
- - - - - -
- * -
- - <%@include file="bodyarea.jsp"%> - - - -
- -
- - - -
- <%@ include file="/jsps/learning/message/msgattachment.jsp"%> -
- -
-
-
- - - - - - - - - - + + + + +
+ + *
+ +<%@include file="bodyarea.jsp"%> + + + +
+ +
+ + + +
+ <%@ include file="/jsps/learning/message/msgattachment.jsp"%> +
+ +
+
+
+ + + + + + + + + + +
Index: lams_tool_forum/web/jsps/learning/message/topicform.jsp =================================================================== diff -u -re52d467fe486dbe4f918436e7abe5e88f3b5eabd -r3fbb95f74569a2eab286873c39982ac3e0a11ce8 --- lams_tool_forum/web/jsps/learning/message/topicform.jsp (.../topicform.jsp) (revision e52d467fe486dbe4f918436e7abe5e88f3b5eabd) +++ lams_tool_forum/web/jsps/learning/message/topicform.jsp (.../topicform.jsp) (revision 3fbb95f74569a2eab286873c39982ac3e0a11ce8) @@ -25,21 +25,19 @@ -
- + - - - - - - - - - + + + + + + + + + -
Index: lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp =================================================================== diff -u -re52d467fe486dbe4f918436e7abe5e88f3b5eabd -r3fbb95f74569a2eab286873c39982ac3e0a11ce8 --- lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp (.../topicreplyform.jsp) (revision e52d467fe486dbe4f918436e7abe5e88f3b5eabd) +++ lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp (.../topicreplyform.jsp) (revision 3fbb95f74569a2eab286873c39982ac3e0a11ce8) @@ -1,48 +1,47 @@ <%@ include file="/common/taglibs.jsp"%> +
+ +
-
- -
- - - - - -
- - * -
- <%@include file="bodyarea.jsp"%> - - - -
- -
- - -
- - ${sessionMap.uploadMaxFileSize} - -
- - -
-
-
- - - - - - - - - -
-
+ + + +
+ + * +
+<%@include file="bodyarea.jsp"%> + + + +
+ +
+ + +
+ + ${sessionMap.uploadMaxFileSize} + +
+ + +
+
+
+ + + + + + + + + +
+
Index: lams_tool_forum/web/jsps/learning/mobile/message/bodyarea.jsp =================================================================== diff -u -rdb44c0602e8fa1b68b2ebce18a58a3d8215cc61b -r3fbb95f74569a2eab286873c39982ac3e0a11ce8 --- lams_tool_forum/web/jsps/learning/mobile/message/bodyarea.jsp (.../bodyarea.jsp) (revision db44c0602e8fa1b68b2ebce18a58a3d8215cc61b) +++ lams_tool_forum/web/jsps/learning/mobile/message/bodyarea.jsp (.../bodyarea.jsp) (revision 3fbb95f74569a2eab286873c39982ac3e0a11ce8) @@ -1,18 +1,18 @@ <%@ include file="/common/taglibs.jsp"%>
- <%-- Does not user general tag because this field need keep compatible with FCKEditor's content --%> + <%-- Does not user general tag because this field need keep compatible with CKEditor's content --%>
<%-- If limitChars == 0, then we don't want to limit the characters at all. --%> - + : + Index: lams_tool_forum/web/jsps/learning/mobile/message/topiceditform.jsp =================================================================== diff -u -rdb44c0602e8fa1b68b2ebce18a58a3d8215cc61b -r3fbb95f74569a2eab286873c39982ac3e0a11ce8 --- lams_tool_forum/web/jsps/learning/mobile/message/topiceditform.jsp (.../topiceditform.jsp) (revision db44c0602e8fa1b68b2ebce18a58a3d8215cc61b) +++ lams_tool_forum/web/jsps/learning/mobile/message/topiceditform.jsp (.../topiceditform.jsp) (revision 3fbb95f74569a2eab286873c39982ac3e0a11ce8) @@ -14,7 +14,7 @@
- Index: lams_tool_forum/web/jsps/learning/mobile/message/topicform.jsp =================================================================== diff -u -rdb44c0602e8fa1b68b2ebce18a58a3d8215cc61b -r3fbb95f74569a2eab286873c39982ac3e0a11ce8 --- lams_tool_forum/web/jsps/learning/mobile/message/topicform.jsp (.../topicform.jsp) (revision db44c0602e8fa1b68b2ebce18a58a3d8215cc61b) +++ lams_tool_forum/web/jsps/learning/mobile/message/topicform.jsp (.../topicform.jsp) (revision 3fbb95f74569a2eab286873c39982ac3e0a11ce8) @@ -19,7 +19,7 @@
- Index: lams_tool_forum/web/jsps/learning/mobile/message/topicreplyform.jsp =================================================================== diff -u -rdb44c0602e8fa1b68b2ebce18a58a3d8215cc61b -r3fbb95f74569a2eab286873c39982ac3e0a11ce8 --- lams_tool_forum/web/jsps/learning/mobile/message/topicreplyform.jsp (.../topicreplyform.jsp) (revision db44c0602e8fa1b68b2ebce18a58a3d8215cc61b) +++ lams_tool_forum/web/jsps/learning/mobile/message/topicreplyform.jsp (.../topicreplyform.jsp) (revision 3fbb95f74569a2eab286873c39982ac3e0a11ce8) @@ -15,7 +15,7 @@
- Index: lams_tool_forum/web/jsps/learning/viewtopic.jsp =================================================================== diff -u -r172f7888a9cc330a3141e9fd1114aa1b17ef92c0 -r3fbb95f74569a2eab286873c39982ac3e0a11ce8 --- lams_tool_forum/web/jsps/learning/viewtopic.jsp (.../viewtopic.jsp) (revision 172f7888a9cc330a3141e9fd1114aa1b17ef92c0) +++ lams_tool_forum/web/jsps/learning/viewtopic.jsp (.../viewtopic.jsp) (revision 3fbb95f74569a2eab286873c39982ac3e0a11ce8) @@ -201,16 +201,3 @@ - - - - - - - - - - - - - Index: lams_tool_forum/web/jsps/monitoring/summary.jsp =================================================================== diff -u -re8cc88b124a415a84a4a5b7c6ebb48b23a7359e0 -r3fbb95f74569a2eab286873c39982ac3e0a11ce8 --- lams_tool_forum/web/jsps/monitoring/summary.jsp (.../summary.jsp) (revision e8cc88b124a415a84a4a5b7c6ebb48b23a7359e0) +++ lams_tool_forum/web/jsps/monitoring/summary.jsp (.../summary.jsp) (revision 3fbb95f74569a2eab286873c39982ac3e0a11ce8) @@ -328,13 +328,30 @@ + + + + + + + , ${forum.minCharacters} + + + + + + + + + + - - , ${forum.limitedChar} + + , ${forum.maxCharacters}