Index: lams_tool_forum/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -r3fbb95f74569a2eab286873c39982ac3e0a11ce8 -rc4854959d539a3b2d18dc30be9a11f7c127050aa --- lams_tool_forum/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 3fbb95f74569a2eab286873c39982ac3e0a11ce8) +++ lams_tool_forum/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision c4854959d539a3b2d18dc30be9a11f7c127050aa) @@ -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 =================================================================== diff -u -r3db9eadae31a41fdc016dff919d9642ab7b43727 -rc4854959d539a3b2d18dc30be9a11f7c127050aa --- lams_tool_forum/web/common/header.jsp (.../header.jsp) (revision 3db9eadae31a41fdc016dff919d9642ab7b43727) +++ lams_tool_forum/web/common/header.jsp (.../header.jsp) (revision c4854959d539a3b2d18dc30be9a11f7c127050aa) @@ -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 c4854959d539a3b2d18dc30be9a11f7c127050aa) @@ -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 -rc4854959d539a3b2d18dc30be9a11f7c127050aa --- lams_tool_forum/web/includes/learnerLayout.jsp (.../learnerLayout.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) +++ lams_tool_forum/web/includes/learnerLayout.jsp (.../learnerLayout.jsp) (revision c4854959d539a3b2d18dc30be9a11f7c127050aa) @@ -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 -rc4854959d539a3b2d18dc30be9a11f7c127050aa --- lams_tool_forum/web/includes/mobileLearnerLayout.jsp (.../mobileLearnerLayout.jsp) (revision 6ce2602aa5f7692243cbbac9bdb2297b641ab250) +++ lams_tool_forum/web/includes/mobileLearnerLayout.jsp (.../mobileLearnerLayout.jsp) (revision c4854959d539a3b2d18dc30be9a11f7c127050aa) @@ -20,28 +20,16 @@ - + + - - + - - - Index: lams_tool_forum/web/jsps/authoring/advance.jsp =================================================================== diff -u -r3fbb95f74569a2eab286873c39982ac3e0a11ce8 -rc4854959d539a3b2d18dc30be9a11f7c127050aa --- lams_tool_forum/web/jsps/authoring/advance.jsp (.../advance.jsp) (revision 3fbb95f74569a2eab286873c39982ac3e0a11ce8) +++ lams_tool_forum/web/jsps/authoring/advance.jsp (.../advance.jsp) (revision c4854959d539a3b2d18dc30be9a11f7c127050aa) @@ -62,15 +62,15 @@

- -

- -

@@ -202,7 +202,6 @@ - + - - - -
- + }); + + + + + : + + + + +
+ +
Index: lams_tool_forum/web/jsps/learning/message/msgattachment.jsp =================================================================== diff -u -r3fbae12edb0a13991ebd07c4f2ebdfbb02d5df99 -rc4854959d539a3b2d18dc30be9a11f7c127050aa --- 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 c4854959d539a3b2d18dc30be9a11f7c127050aa) @@ -3,23 +3,26 @@ - - - - - - - -
: - - - - - - - - -
+ + + + + + + + +
+ : + + + + + + + + + +
Index: lams_tool_forum/web/jsps/learning/message/topiceditform.jsp =================================================================== diff -u -r3fbb95f74569a2eab286873c39982ac3e0a11ce8 -rc4854959d539a3b2d18dc30be9a11f7c127050aa --- lams_tool_forum/web/jsps/learning/message/topiceditform.jsp (.../topiceditform.jsp) (revision 3fbb95f74569a2eab286873c39982ac3e0a11ce8) +++ lams_tool_forum/web/jsps/learning/message/topiceditform.jsp (.../topiceditform.jsp) (revision c4854959d539a3b2d18dc30be9a11f7c127050aa) @@ -4,9 +4,7 @@
- - +
@@ -29,6 +27,7 @@
+
@@ -43,6 +42,5 @@ styleClass="button"> -
Index: lams_tool_forum/web/jsps/learning/mobile/message/msgattachment.jsp =================================================================== diff -u -r456bef8020946d9bae40a5d5010e371407961d27 -rc4854959d539a3b2d18dc30be9a11f7c127050aa --- 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 c4854959d539a3b2d18dc30be9a11f7c127050aa) @@ -3,23 +3,27 @@ - - - - - - - -
: - - - - - - - - -
+ + + + + + + + + + +
+ : + + + + + + + + +
Index: lams_tool_forum/web/jsps/learning/mobile/viewtopic.jsp =================================================================== diff -u -r172f7888a9cc330a3141e9fd1114aa1b17ef92c0 -rc4854959d539a3b2d18dc30be9a11f7c127050aa --- lams_tool_forum/web/jsps/learning/mobile/viewtopic.jsp (.../viewtopic.jsp) (revision 172f7888a9cc330a3141e9fd1114aa1b17ef92c0) +++ lams_tool_forum/web/jsps/learning/mobile/viewtopic.jsp (.../viewtopic.jsp) (revision c4854959d539a3b2d18dc30be9a11f7c127050aa) @@ -63,15 +63,6 @@ }); }); - function removeAtt(mapID){ - removeItemAttachmentUrl = removeItemAttachmentUrl + "?sessionMapID="+ mapID; - removeItemAttachment(); - } - - function closeAndRefreshParentMonitoringWindow() { - refreshParentMonitoringWindow(); - window.close(); - } Index: lams_tool_forum/web/jsps/learning/reply.jsp =================================================================== diff -u -r6a98321bc4bc752a6ad20f890c38da1f5030c120 -rc4854959d539a3b2d18dc30be9a11f7c127050aa --- lams_tool_forum/web/jsps/learning/reply.jsp (.../reply.jsp) (revision 6a98321bc4bc752a6ad20f890c38da1f5030c120) +++ lams_tool_forum/web/jsps/learning/reply.jsp (.../reply.jsp) (revision c4854959d539a3b2d18dc30be9a11f7c127050aa) @@ -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 -r3fbb95f74569a2eab286873c39982ac3e0a11ce8 -rc4854959d539a3b2d18dc30be9a11f7c127050aa --- lams_tool_forum/web/jsps/learning/viewtopic.jsp (.../viewtopic.jsp) (revision 3fbb95f74569a2eab286873c39982ac3e0a11ce8) +++ lams_tool_forum/web/jsps/learning/viewtopic.jsp (.../viewtopic.jsp) (revision c4854959d539a3b2d18dc30be9a11f7c127050aa) @@ -70,15 +70,6 @@ location.href= ""+reqIDVar.getTime();; } - function removeAtt(mapID){ - removeItemAttachmentUrl = removeItemAttachmentUrl + "?sessionMapID="+ mapID; - removeItemAttachment(); - } - - function closeAndRefreshParentMonitoringWindow() { - refreshParentMonitoringWindow(); - window.close(); - } Index: lams_tool_forum/web/jsps/monitoring/viewmarks.jsp =================================================================== diff -u -r6a98321bc4bc752a6ad20f890c38da1f5030c120 -rc4854959d539a3b2d18dc30be9a11f7c127050aa --- lams_tool_forum/web/jsps/monitoring/viewmarks.jsp (.../viewmarks.jsp) (revision 6a98321bc4bc752a6ad20f890c38da1f5030c120) +++ lams_tool_forum/web/jsps/monitoring/viewmarks.jsp (.../viewmarks.jsp) (revision c4854959d539a3b2d18dc30be9a11f7c127050aa) @@ -1,4 +1,12 @@ <%@ include file="/common/taglibs.jsp"%> + + +