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 ac12c171d18673d283c3304f1333ebb00e3819d0) @@ -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 -rac12c171d18673d283c3304f1333ebb00e3819d0 --- 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 ac12c171d18673d283c3304f1333ebb00e3819d0) @@ -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 -rb89ab02a8f92e5860ffa8e50b805254455b67393 -rac12c171d18673d283c3304f1333ebb00e3819d0 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java (.../ForumService.java) (revision b89ab02a8f92e5860ffa8e50b805254455b67393) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java (.../ForumService.java) (revision ac12c171d18673d283c3304f1333ebb00e3819d0) @@ -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 -rac12c171d18673d283c3304f1333ebb00e3819d0 --- 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 ac12c171d18673d283c3304f1333ebb00e3819d0) @@ -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 -rac12c171d18673d283c3304f1333ebb00e3819d0 --- 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 ac12c171d18673d283c3304f1333ebb00e3819d0) @@ -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 -rac12c171d18673d283c3304f1333ebb00e3819d0 --- 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 ac12c171d18673d283c3304f1333ebb00e3819d0) @@ -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 -rac12c171d18673d283c3304f1333ebb00e3819d0 --- 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 ac12c171d18673d283c3304f1333ebb00e3819d0) @@ -96,7 +96,8 @@ forum.setAllowEdit(false); forum.setAllowAnonym(false); forum.setAllowRichEditor(false); - forum.setLimitedInput(false); + forum.setLimitedMinCharacters(false); + forum.setLimitedMaxCharacters(false); forum.setLockWhenFinished(false); forum.setAllowNewTopic(false); forum.setAllowUpload(false); Index: lams_tool_forum/web/common/header.jsp =================================================================== diff -u -r3db9eadae31a41fdc016dff919d9642ab7b43727 -rac12c171d18673d283c3304f1333ebb00e3819d0 --- lams_tool_forum/web/common/header.jsp (.../header.jsp) (revision 3db9eadae31a41fdc016dff919d9642ab7b43727) +++ lams_tool_forum/web/common/header.jsp (.../header.jsp) (revision ac12c171d18673d283c3304f1333ebb00e3819d0) @@ -21,13 +21,4 @@ - - - - - + \ No newline at end of file Index: lams_tool_forum/web/includes/javascript/learner.js =================================================================== diff -u --- lams_tool_forum/web/includes/javascript/learner.js (revision 0) +++ lams_tool_forum/web/includes/javascript/learner.js (revision ac12c171d18673d283c3304f1333ebb00e3819d0) @@ -0,0 +1,36 @@ +function removeAtt(mapID){ + + $("#itemAttachmentArea").load( + removeItemAttachmentUrl + "?sessionMapID="+ mapID, + { + sessionMapID: mapID, + reqID: (new Date()).getTime() + } + ); + +} + +function validateForm() { + //in case main characters restriction is ON check it's been fullfilled + var isMinCharactersEnabled = $("#min-characters-enabled").val() == "true"; + var charsMissing = $("#char-required-div").html(); + + var isValid = !isMinCharactersEnabled || isMinCharactersEnabled && (charsMissing == "0"); + if (!isValid) { + var warningMsg = warning.replace("{0}", charsMissing); + alert(warningMsg); + } + + return isValid; +} + +function getNumberOfCharacters(value, isRemoveHtmlTags) { + + //HTML tags stripping + if (isRemoveHtmlTags) { + value = value.replace(/ /g, ' ').replace(/\n/gi, '').replace(/<\/?[a-z][^>]*>/gi, ''); + } + + var wordCount = value ? (value).length : 0; + return wordCount; +} \ No newline at end of file Index: lams_tool_forum/web/includes/learnerLayout.jsp =================================================================== diff -u -r18e5e690d2e1a7c3d918759f7a2827c8205feaac -rac12c171d18673d283c3304f1333ebb00e3819d0 --- lams_tool_forum/web/includes/learnerLayout.jsp (.../learnerLayout.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) +++ lams_tool_forum/web/includes/learnerLayout.jsp (.../learnerLayout.jsp) (revision ac12c171d18673d283c3304f1333ebb00e3819d0) @@ -1,31 +1,44 @@ - + <%@ include file="/common/taglibs.jsp"%> <%@ taglib uri="tags-tiles" prefix="tiles"%> - - - - - - + + + + <fmt:message key="activity.title" /> - <%@ include file="/common/header.jsp"%> + + + + + + + + + + + + + + + + + - - + var warning = ''; + + + - + Index: lams_tool_forum/web/includes/mobileLearnerLayout.jsp =================================================================== diff -u -r6ce2602aa5f7692243cbbac9bdb2297b641ab250 -rac12c171d18673d283c3304f1333ebb00e3819d0 --- lams_tool_forum/web/includes/mobileLearnerLayout.jsp (.../mobileLearnerLayout.jsp) (revision 6ce2602aa5f7692243cbbac9bdb2297b641ab250) +++ lams_tool_forum/web/includes/mobileLearnerLayout.jsp (.../mobileLearnerLayout.jsp) (revision ac12c171d18673d283c3304f1333ebb00e3819d0) @@ -17,31 +17,10 @@ - - - - - - - - - - - + + Index: lams_tool_forum/web/jsps/authoring/advance.jsp =================================================================== diff -u -r281244f5d518e88719ffc871ac71bb03136cb03e -rac12c171d18673d283c3304f1333ebb00e3819d0 --- lams_tool_forum/web/jsps/authoring/advance.jsp (.../advance.jsp) (revision 281244f5d518e88719ffc871ac71bb03136cb03e) +++ lams_tool_forum/web/jsps/authoring/advance.jsp (.../advance.jsp) (revision ac12c171d18673d283c3304f1333ebb00e3819d0) @@ -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,105 @@

Index: lams_tool_forum/web/jsps/learning/create.jsp =================================================================== diff -u -r172f7888a9cc330a3141e9fd1114aa1b17ef92c0 -rac12c171d18673d283c3304f1333ebb00e3819d0 --- lams_tool_forum/web/jsps/learning/create.jsp (.../create.jsp) (revision 172f7888a9cc330a3141e9fd1114aa1b17ef92c0) +++ lams_tool_forum/web/jsps/learning/create.jsp (.../create.jsp) (revision ac12c171d18673d283c3304f1333ebb00e3819d0) @@ -1,9 +1,9 @@ <%@ include file="/common/taglibs.jsp"%> - + + - + Index: lams_tool_forum/web/jsps/learning/edit.jsp =================================================================== diff -u -r172f7888a9cc330a3141e9fd1114aa1b17ef92c0 -rac12c171d18673d283c3304f1333ebb00e3819d0 --- lams_tool_forum/web/jsps/learning/edit.jsp (.../edit.jsp) (revision 172f7888a9cc330a3141e9fd1114aa1b17ef92c0) +++ lams_tool_forum/web/jsps/learning/edit.jsp (.../edit.jsp) (revision ac12c171d18673d283c3304f1333ebb00e3819d0) @@ -1,26 +1,26 @@ <%@ include file="/common/taglibs.jsp"%> - + + - +
- -

- -

- - - + +

+ +

+

- + - - <%@ 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 -rac12c171d18673d283c3304f1333ebb00e3819d0 --- 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 ac12c171d18673d283c3304f1333ebb00e3819d0) @@ -1,51 +1,157 @@ <%@ include file="/common/taglibs.jsp"%>
- - - - - - - - <%-- Does not user general tag becuase this field need keep compatible with FCKEditor's content --%> - -
- <%-- If limitChars == 0, then we don't want to limit the characters at all. --%> - - : - - - - -
-
-
- + var count = (limit - charactersCount) > 0 ? limit - charactersCount : 0; + $('#max-limit-count').val(count); + $('#char-left-div').html(count); + + //limit exceeded in case of CKEditor + } else if (isCkeditor) { + //detect key pressed + var key = ((evt.data === undefined) || (evt.data.$ === undefined)) ? null : evt.data.$.keyCode || evt.data.$.charCode; + + //don't block backspace and del + if (key == 8 || key == 46) { + return; + } + + //evt.cancel(); + ckeditor.execCommand( 'undo' ); + + //limit exceeded in case of textarea + } else { + this.value = this.value.substring(0, limit); + //fix a bug: when change "this.value", onchange event won't be fired any more. So this will + //manually handle onchange event. It is a kind of crack coding! + filterData(document.getElementById('message.body__lamstextarea'), + document.getElementById('message.body__lamshidden')); + + } + }; + + //assign function + if (isCkeditor) { + // @todo Make this more elegant (.on('change') once we upgrade to Ckeditor 4 + //ckeditor.on('key', counter); + ckeditor.on('paste', counter); + ckeditor.on('afterCommandExec', counter); + ckeditor.on("instanceReady", function(){ + this.document.on("keyup", counter); + }); + //count characters initially + ckeditor.on('instanceReady', counter); + + } else { + $('textarea[id="message.body__lamstextarea"]').on('change keydown keypress keyup paste', counter); + //count characters initially + counter(); + } + }); + + + + + : + + + + +
+ +
Index: lams_tool_forum/web/jsps/learning/message/msgattachment.jsp =================================================================== diff -u -r3fbae12edb0a13991ebd07c4f2ebdfbb02d5df99 -rac12c171d18673d283c3304f1333ebb00e3819d0 --- lams_tool_forum/web/jsps/learning/message/msgattachment.jsp (.../msgattachment.jsp) (revision 3fbae12edb0a13991ebd07c4f2ebdfbb02d5df99) +++ lams_tool_forum/web/jsps/learning/message/msgattachment.jsp (.../msgattachment.jsp) (revision ac12c171d18673d283c3304f1333ebb00e3819d0) @@ -3,23 +3,26 @@ - - - - - - - -
: - - - - - - - - -
+ + + + + + + + +
+ : + + + + + + + + + +
Index: lams_tool_forum/web/jsps/learning/message/topiceditform.jsp =================================================================== diff -u -rdb44c0602e8fa1b68b2ebce18a58a3d8215cc61b -rac12c171d18673d283c3304f1333ebb00e3819d0 --- 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 ac12c171d18673d283c3304f1333ebb00e3819d0) @@ -1,45 +1,46 @@ <%@ 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 -rac12c171d18673d283c3304f1333ebb00e3819d0 --- 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 ac12c171d18673d283c3304f1333ebb00e3819d0) @@ -25,21 +25,19 @@ -
- + - - - - - - - - - + + + + + + + + + -
Index: lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp =================================================================== diff -u -re52d467fe486dbe4f918436e7abe5e88f3b5eabd -rac12c171d18673d283c3304f1333ebb00e3819d0 --- 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 ac12c171d18673d283c3304f1333ebb00e3819d0) @@ -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/create.jsp =================================================================== diff -u -r172f7888a9cc330a3141e9fd1114aa1b17ef92c0 -rac12c171d18673d283c3304f1333ebb00e3819d0 --- lams_tool_forum/web/jsps/learning/mobile/create.jsp (.../create.jsp) (revision 172f7888a9cc330a3141e9fd1114aa1b17ef92c0) +++ lams_tool_forum/web/jsps/learning/mobile/create.jsp (.../create.jsp) (revision ac12c171d18673d283c3304f1333ebb00e3819d0) @@ -2,7 +2,9 @@
- + + Index: lams_tool_forum/web/jsps/learning/mobile/edit.jsp =================================================================== diff -u -r172f7888a9cc330a3141e9fd1114aa1b17ef92c0 -rac12c171d18673d283c3304f1333ebb00e3819d0 --- lams_tool_forum/web/jsps/learning/mobile/edit.jsp (.../edit.jsp) (revision 172f7888a9cc330a3141e9fd1114aa1b17ef92c0) +++ lams_tool_forum/web/jsps/learning/mobile/edit.jsp (.../edit.jsp) (revision ac12c171d18673d283c3304f1333ebb00e3819d0) @@ -2,7 +2,9 @@
- + + Index: lams_tool_forum/web/jsps/learning/mobile/message/bodyarea.jsp =================================================================== diff -u -rdb44c0602e8fa1b68b2ebce18a58a3d8215cc61b -rac12c171d18673d283c3304f1333ebb00e3819d0 --- 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 ac12c171d18673d283c3304f1333ebb00e3819d0) @@ -1,41 +1,145 @@ <%@ include file="/common/taglibs.jsp"%> + + +
- <%-- Does not user general tag because this field need keep compatible with FCKEditor's content --%> - + + <%-- for validateForm() method --%> + + + +
+ + ${sessionMap.minCharacters} + +
+
+ + <%-- 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/msgattachment.jsp =================================================================== diff -u -r456bef8020946d9bae40a5d5010e371407961d27 -rac12c171d18673d283c3304f1333ebb00e3819d0 --- lams_tool_forum/web/jsps/learning/mobile/message/msgattachment.jsp (.../msgattachment.jsp) (revision 456bef8020946d9bae40a5d5010e371407961d27) +++ lams_tool_forum/web/jsps/learning/mobile/message/msgattachment.jsp (.../msgattachment.jsp) (revision ac12c171d18673d283c3304f1333ebb00e3819d0) @@ -3,23 +3,27 @@ - - - - - - - -
: - - - - - - - - -
+ + + + + + + + + + +
+ : + + + + + + + + +
Index: lams_tool_forum/web/jsps/learning/mobile/message/topicform.jsp =================================================================== diff -u -rdb44c0602e8fa1b68b2ebce18a58a3d8215cc61b -rac12c171d18673d283c3304f1333ebb00e3819d0 --- 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 ac12c171d18673d283c3304f1333ebb00e3819d0) @@ -19,7 +19,7 @@
- Index: lams_tool_forum/web/jsps/learning/mobile/message/topicreplyform.jsp =================================================================== diff -u -rdb44c0602e8fa1b68b2ebce18a58a3d8215cc61b -rac12c171d18673d283c3304f1333ebb00e3819d0 --- 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 ac12c171d18673d283c3304f1333ebb00e3819d0) @@ -1,29 +1,29 @@ <%@ include file="/common/taglibs.jsp"%> -
- -
+
+ +
- - + + -
- - * -
- <%@include file="bodyarea.jsp"%> +
+ + * +
+<%@include file="bodyarea.jsp"%> -
-
- - - - - - - -
-
+
+
+ + + + + + + +
+
Index: lams_tool_forum/web/jsps/learning/mobile/message/topicview.jsp =================================================================== diff -u -rae9a047ca47b8f553103691a7015f37ac956c668 -rac12c171d18673d283c3304f1333ebb00e3819d0 --- lams_tool_forum/web/jsps/learning/mobile/message/topicview.jsp (.../topicview.jsp) (revision ae9a047ca47b8f553103691a7015f37ac956c668) +++ lams_tool_forum/web/jsps/learning/mobile/message/topicview.jsp (.../topicview.jsp) (revision ac12c171d18673d283c3304f1333ebb00e3819d0) @@ -9,6 +9,7 @@ +
em;"> @@ -23,6 +24,7 @@ + + + +
@@ -39,6 +41,7 @@
@@ -53,8 +56,8 @@
- + +
@@ -77,6 +80,7 @@
@@ -94,7 +98,8 @@ - + @@ -103,7 +108,7 @@
- Index: lams_tool_forum/web/jsps/learning/mobile/reply.jsp =================================================================== diff -u -r6a98321bc4bc752a6ad20f890c38da1f5030c120 -rac12c171d18673d283c3304f1333ebb00e3819d0 --- lams_tool_forum/web/jsps/learning/mobile/reply.jsp (.../reply.jsp) (revision 6a98321bc4bc752a6ad20f890c38da1f5030c120) +++ lams_tool_forum/web/jsps/learning/mobile/reply.jsp (.../reply.jsp) (revision ac12c171d18673d283c3304f1333ebb00e3819d0) @@ -2,7 +2,9 @@
- + + Index: lams_tool_forum/web/jsps/learning/mobile/viewforum.jsp =================================================================== diff -u -r3290c7fabc90c37f9f54cd0dba4a454162138bad -rac12c171d18673d283c3304f1333ebb00e3819d0 --- lams_tool_forum/web/jsps/learning/mobile/viewforum.jsp (.../viewforum.jsp) (revision 3290c7fabc90c37f9f54cd0dba4a454162138bad) +++ lams_tool_forum/web/jsps/learning/mobile/viewforum.jsp (.../viewforum.jsp) (revision ac12c171d18673d283c3304f1333ebb00e3819d0) @@ -5,7 +5,7 @@ -
+
+ @@ -63,20 +63,11 @@ }); }); - function removeAtt(mapID){ - removeItemAttachmentUrl = removeItemAttachmentUrl + "?sessionMapID="+ mapID; - removeItemAttachment(); - } - - function closeAndRefreshParentMonitoringWindow() { - refreshParentMonitoringWindow(); - window.close(); - } -

@@ -112,20 +102,20 @@
- - - - - + + + + +
- - - - - + + + + +
@@ -183,9 +173,3 @@ - - - - - - Index: lams_tool_forum/web/jsps/learning/reply.jsp =================================================================== diff -u -r6a98321bc4bc752a6ad20f890c38da1f5030c120 -rac12c171d18673d283c3304f1333ebb00e3819d0 --- lams_tool_forum/web/jsps/learning/reply.jsp (.../reply.jsp) (revision 6a98321bc4bc752a6ad20f890c38da1f5030c120) +++ lams_tool_forum/web/jsps/learning/reply.jsp (.../reply.jsp) (revision ac12c171d18673d283c3304f1333ebb00e3819d0) @@ -2,7 +2,9 @@ <%-- If you change this file, remember to update the copy made for CNG-28 --%> - + + @@ -11,50 +13,51 @@
-

- -

+

+ +

-

-

+

+ +

+ + + + + + + + + + + +
+ +
+ + + + + - +
+ +
+
+ +

-
- - - - - - - - - - - -
- - - -
-
- - -

- -

- <%@ include file="/jsps/learning/message/topicreplyform.jsp"%> + <%@ include file="/jsps/learning/message/topicreplyform.jsp"%>
- - Index: lams_tool_forum/web/jsps/learning/viewtopic.jsp =================================================================== diff -u -r172f7888a9cc330a3141e9fd1114aa1b17ef92c0 -rac12c171d18673d283c3304f1333ebb00e3819d0 --- lams_tool_forum/web/jsps/learning/viewtopic.jsp (.../viewtopic.jsp) (revision 172f7888a9cc330a3141e9fd1114aa1b17ef92c0) +++ lams_tool_forum/web/jsps/learning/viewtopic.jsp (.../viewtopic.jsp) (revision ac12c171d18673d283c3304f1333ebb00e3819d0) @@ -70,15 +70,6 @@ location.href= ""+reqIDVar.getTime();; } - function removeAtt(mapID){ - removeItemAttachmentUrl = removeItemAttachmentUrl + "?sessionMapID="+ mapID; - removeItemAttachment(); - } - - function closeAndRefreshParentMonitoringWindow() { - refreshParentMonitoringWindow(); - window.close(); - } @@ -201,16 +192,3 @@ - - - - - - - - - - - - - Index: lams_tool_forum/web/jsps/monitoring/summary.jsp =================================================================== diff -u -re8cc88b124a415a84a4a5b7c6ebb48b23a7359e0 -rac12c171d18673d283c3304f1333ebb00e3819d0 --- lams_tool_forum/web/jsps/monitoring/summary.jsp (.../summary.jsp) (revision e8cc88b124a415a84a4a5b7c6ebb48b23a7359e0) +++ lams_tool_forum/web/jsps/monitoring/summary.jsp (.../summary.jsp) (revision ac12c171d18673d283c3304f1333ebb00e3819d0) @@ -328,13 +328,30 @@ + + + + + + + , ${forum.minCharacters} + + + + + + + + + + - - , ${forum.limitedChar} + + , ${forum.maxCharacters} Index: lams_tool_forum/web/jsps/monitoring/viewmarks.jsp =================================================================== diff -u -r6a98321bc4bc752a6ad20f890c38da1f5030c120 -rac12c171d18673d283c3304f1333ebb00e3819d0 --- lams_tool_forum/web/jsps/monitoring/viewmarks.jsp (.../viewmarks.jsp) (revision 6a98321bc4bc752a6ad20f890c38da1f5030c120) +++ lams_tool_forum/web/jsps/monitoring/viewmarks.jsp (.../viewmarks.jsp) (revision ac12c171d18673d283c3304f1333ebb00e3819d0) @@ -1,4 +1,12 @@ <%@ include file="/common/taglibs.jsp"%> + + +