Index: lams_tool_forum/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/conf/language/lams/ApplicationResources_en_AU.properties,v diff -u -r1.47 -r1.48 --- lams_tool_forum/conf/language/lams/ApplicationResources_en_AU.properties 17 Dec 2014 00:12:30 -0000 1.47 +++ lams_tool_forum/conf/language/lams/ApplicationResources_en_AU.properties 27 Dec 2014 00:03:14 -0000 1.48 @@ -231,5 +231,7 @@ label.rateLimits.topic.reminder =You have rated {0} postings already. label.char.required =Characters required +info.minimum.number.characters =The minimum number of characters for your response is {0}. +warn.minimum.number.characters =You need to enter {0} characters more to proceed. #======= End labels: Exported 222 labels for en AU ===== Index: lams_tool_forum/web/common/header.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/common/header.jsp,v diff -u -r1.13 -r1.14 --- lams_tool_forum/web/common/header.jsp 27 Jun 2014 07:26:17 -0000 1.13 +++ lams_tool_forum/web/common/header.jsp 27 Dec 2014 00:03:15 -0000 1.14 @@ -21,13 +21,4 @@ - - - - - + \ No newline at end of file Index: lams_tool_forum/web/includes/learnerLayout.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/includes/learnerLayout.jsp,v diff -u -r1.6 -r1.7 --- lams_tool_forum/web/includes/learnerLayout.jsp 8 Jun 2007 01:35:33 -0000 1.6 +++ lams_tool_forum/web/includes/learnerLayout.jsp 27 Dec 2014 00:03:14 -0000 1.7 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/includes/mobileLearnerLayout.jsp,v diff -u -r1.5 -r1.6 --- lams_tool_forum/web/includes/mobileLearnerLayout.jsp 6 Jun 2013 14:40:36 -0000 1.5 +++ lams_tool_forum/web/includes/mobileLearnerLayout.jsp 27 Dec 2014 00:03:14 -0000 1.6 @@ -20,28 +20,16 @@ - + + - - + - - - Index: lams_tool_forum/web/includes/javascript/learner.js =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/includes/javascript/learner.js,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_forum/web/includes/javascript/learner.js 27 Dec 2014 00:03:14 -0000 1.1 @@ -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/jsps/authoring/advance.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/advance.jsp,v diff -u -r1.32 -r1.33 --- lams_tool_forum/web/jsps/authoring/advance.jsp 17 Dec 2014 00:12:30 -0000 1.32 +++ lams_tool_forum/web/jsps/authoring/advance.jsp 27 Dec 2014 00:03:14 -0000 1.33 @@ -62,15 +62,15 @@

- -

- -

@@ -202,7 +202,6 @@ Index: lams_tool_forum/web/jsps/learning/message/bodyarea.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/message/bodyarea.jsp,v diff -u -r1.15 -r1.16 --- lams_tool_forum/web/jsps/learning/message/bodyarea.jsp 17 Dec 2014 00:12:30 -0000 1.15 +++ lams_tool_forum/web/jsps/learning/message/bodyarea.jsp 27 Dec 2014 00:03:14 -0000 1.16 @@ -1,90 +1,157 @@ <%@ include file="/common/taglibs.jsp"%>
- - - - - - - + <%-- for validateForm() method --%> + - <%-- Does not user general tag becuase this field need keep compatible with CKEditor's content --%> - -
+ +
+ + ${sessionMap.minCharacters} + +
+ + + + + + + + - <%-- If limitChars == 0, then we don't want to limit the characters at all. --%> - - : - -
+ + <%-- 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. --%> + + : + +
- - + - - - -
- + }); + + + + + : + + + + +
+ +
Index: lams_tool_forum/web/jsps/learning/message/msgattachment.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/message/msgattachment.jsp,v diff -u -r1.4 -r1.5 --- lams_tool_forum/web/jsps/learning/message/msgattachment.jsp 5 May 2008 06:51:21 -0000 1.4 +++ lams_tool_forum/web/jsps/learning/message/msgattachment.jsp 27 Dec 2014 00:03:14 -0000 1.5 @@ -3,23 +3,26 @@ - - - - - - - -
: - - - - - - - - -
+ + + + + + + + +
+ : + + + + + + + + + +
Index: lams_tool_forum/web/jsps/learning/message/topiceditform.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/message/topiceditform.jsp,v diff -u -r1.19 -r1.20 --- lams_tool_forum/web/jsps/learning/message/topiceditform.jsp 17 Dec 2014 00:12:30 -0000 1.19 +++ lams_tool_forum/web/jsps/learning/message/topiceditform.jsp 27 Dec 2014 00:03:14 -0000 1.20 @@ -4,9 +4,7 @@
- - +
@@ -29,6 +27,7 @@
+
@@ -43,6 +42,5 @@ styleClass="button"> -
Index: lams_tool_forum/web/jsps/learning/mobile/viewtopic.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/mobile/viewtopic.jsp,v diff -u -r1.9 -r1.10 --- lams_tool_forum/web/jsps/learning/mobile/viewtopic.jsp 26 Mar 2014 23:27:40 -0000 1.9 +++ lams_tool_forum/web/jsps/learning/mobile/viewtopic.jsp 27 Dec 2014 00:03:14 -0000 1.10 @@ -63,15 +63,6 @@ }); }); - function removeAtt(mapID){ - removeItemAttachmentUrl = removeItemAttachmentUrl + "?sessionMapID="+ mapID; - removeItemAttachment(); - } - - function closeAndRefreshParentMonitoringWindow() { - refreshParentMonitoringWindow(); - window.close(); - } Index: lams_tool_forum/web/jsps/learning/mobile/message/msgattachment.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/mobile/message/msgattachment.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_forum/web/jsps/learning/mobile/message/msgattachment.jsp 7 Feb 2012 16:56:31 -0000 1.1 +++ lams_tool_forum/web/jsps/learning/mobile/message/msgattachment.jsp 27 Dec 2014 00:03:14 -0000 1.2 @@ -3,23 +3,27 @@ - - - - - - - -
: - - - - - - - - -
+ + + + + + + + + + +
+ : + + + + + + + + +
Index: lams_tool_forum/web/jsps/monitoring/viewmarks.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/monitoring/viewmarks.jsp,v diff -u -r1.10 -r1.11 --- lams_tool_forum/web/jsps/monitoring/viewmarks.jsp 4 Apr 2014 15:26:37 -0000 1.10 +++ lams_tool_forum/web/jsps/monitoring/viewmarks.jsp 27 Dec 2014 00:03:15 -0000 1.11 @@ -1,4 +1,12 @@ <%@ include file="/common/taglibs.jsp"%> + + +